Merge staging-next into staging

This commit is contained in:
github-actions[bot] 2024-03-22 12:01:46 +00:00 committed by GitHub
commit 350f0a9a66
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
60 changed files with 1266 additions and 816 deletions

View File

@ -6,8 +6,9 @@ binaries (without the reliance on external inputs):
- `bootstrap-tools`: an archive with the compiler toolchain and other - `bootstrap-tools`: an archive with the compiler toolchain and other
helper tools enough to build the rest of the `nixpkgs`. helper tools enough to build the rest of the `nixpkgs`.
- initial binaries needed to unpack `bootstrap-tools.*`. On `linux` - initial binaries needed to unpack `bootstrap-tools.*`. On `linux`
it's just `busybox`, on `darwin` it's `sh`, `bzip2`, `mkdir` and it's just `busybox`, on `darwin` it is unpack.nar.xz which contains
`cpio`. These binaries can be executed directly from the store. the binaries and script needed to unpack the tools. These binaries
can be executed directly from the store.
These are called "bootstrap files". These are called "bootstrap files".
@ -74,12 +75,3 @@ There are two types of bootstrap files:
The `.build` job contains `/on-server/` subdirectory with binaries to The `.build` job contains `/on-server/` subdirectory with binaries to
be uploaded to `tarballs.nixos.org`. be uploaded to `tarballs.nixos.org`.
The files are uploaded to `tarballs.nixos.org` by writers to `S3` store. The files are uploaded to `tarballs.nixos.org` by writers to `S3` store.
## TODOs
- `pkgs/stdenv/darwin` file layout is slightly different from
`pkgs/stdenv/linux`. Once `linux` seed update becomes a routine we can
bring `darwin` in sync if it's feasible.
- `darwin` definition of `.build` `on-server/` directory layout differs
and should be updated.

View File

@ -6,6 +6,8 @@
#! nix-shell -p nix #! nix-shell -p nix
#! nix-shell -p jq #! nix-shell -p jq
set -o pipefail
# How the refresher works: # How the refresher works:
# #
# For a given list of <targets>: # For a given list of <targets>:
@ -15,6 +17,9 @@
# 4. calculate hashes and craft the commit message with the details on # 4. calculate hashes and craft the commit message with the details on
# how to upload the result to 'tarballs.nixos.org' # how to upload the result to 'tarballs.nixos.org'
scratch_dir=$(mktemp -d)
trap 'rm -rf -- "${scratch_dir}"' EXIT
usage() { usage() {
cat >&2 <<EOF cat >&2 <<EOF
Usage: Usage:
@ -101,15 +106,17 @@ is_cross() {
} }
nar_sri_get() { nar_sri_get() {
local ouput sri local restore_path store_path
output=$(nix-build --expr \ ((${#@} != 2)) && die "nar_sri_get /path/to/name.nar.xz name"
'import <nix/fetchurl.nix> { restore_path="${scratch_dir}/$2"
url = "'"$1"'"; xz -d < "$1" | nix-store --restore "${restore_path}"
unpack = true; [[ $? -ne 0 ]] && die "Failed to unpack '$1'"
}' 2>&1 || true)
sri=$(echo "$output" | awk '/^\s+got:\s+/{ print $2 }') store_path=$(nix-store --add "${restore_path}")
[[ -z "$sri" ]] && die "$output" [[ $? -ne 0 ]] && die "Failed to add '$restore_path' to store"
echo "$sri" rm -rf -- "${restore_path}"
nix-hash --to-sri "$(nix-store --query --hash "${store_path}")"
} }
# collect passed options # collect passed options
@ -239,9 +246,12 @@ EOF
executable_nix="executable = true;" executable_nix="executable = true;"
fi fi
unpack_nix= unpack_nix=
if [[ $fname = *.nar.* ]]; then name_nix=
if [[ $fname = *.nar.xz ]]; then
unpack_nix="unpack = true;" unpack_nix="unpack = true;"
sri=$(nar_sri_get "file://$p") name_nix="name = \"${fname%.nar.xz}\";"
sri=$(nar_sri_get "$p" "${fname%.nar.xz}")
[[ $? -ne 0 ]] && die "Failed to get hash of '$p'"
else else
sha256=$(nix-prefetch-url $executable_arg --name "$fname" "file://$p") sha256=$(nix-prefetch-url $executable_arg --name "$fname" "file://$p")
[[ $? -ne 0 ]] && die "Failed to get the hash for '$p'" [[ $? -ne 0 ]] && die "Failed to get the hash for '$p'"
@ -255,6 +265,7 @@ EOF
url = "http://tarballs.nixos.org/${s3_prefix}/${nixpkgs_revision}/$fname"; url = "http://tarballs.nixos.org/${s3_prefix}/${nixpkgs_revision}/$fname";
hash = "${sri}";$( hash = "${sri}";$(
[[ -n ${executable_nix} ]] && printf "\n %s" "${executable_nix}" [[ -n ${executable_nix} ]] && printf "\n %s" "${executable_nix}"
[[ -n ${name_nix} ]] && printf "\n %s" "${name_nix}"
[[ -n ${unpack_nix} ]] && printf "\n %s" "${unpack_nix}" [[ -n ${unpack_nix} ]] && printf "\n %s" "${unpack_nix}"
) )
}; };

View File

@ -67,10 +67,12 @@ in
''; '';
systemwideConfigPkg = pkgs.writeTextDir "share/wireplumber/wireplumber.conf.d/90-nixos-systemwide.conf" '' systemwideConfigPkg = pkgs.writeTextDir "share/wireplumber/wireplumber.conf.d/90-nixos-systemwide.conf" ''
# When running system-wide, we don't have logind to call ReserveDevice # When running system-wide, we don't have logind to call ReserveDevice,
# And bluetooth logind integration needs to be disabled
wireplumber.profiles = { wireplumber.profiles = {
main = { main = {
support.reserve-device = disabled support.reserve-device = disabled
monitor.bluez.seat-monitoring = disabled
} }
} }
''; '';

View File

@ -3,10 +3,10 @@
"clion": { "clion": {
"update-channel": "CLion RELEASE", "update-channel": "CLion RELEASE",
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz",
"version": "2023.3.3", "version": "2023.3.4",
"sha256": "e0add1e84352e368ad4c8de0ff8ea003dc56f3ee92c503e93bfddf4a56e97f31", "sha256": "eae2e1646387ee36a2f24c10d924647fd3d00bb31dd42e9c17438ae7aecf79a8",
"url": "https://download.jetbrains.com/cpp/CLion-2023.3.3.tar.gz", "url": "https://download.jetbrains.com/cpp/CLion-2023.3.4.tar.gz",
"build_number": "233.14015.92" "build_number": "233.14475.31"
}, },
"datagrip": { "datagrip": {
"update-channel": "DataGrip RELEASE", "update-channel": "DataGrip RELEASE",
@ -19,117 +19,117 @@
"dataspell": { "dataspell": {
"update-channel": "DataSpell RELEASE", "update-channel": "DataSpell RELEASE",
"url-template": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz", "url-template": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz",
"version": "2023.3.3", "version": "2023.3.4",
"sha256": "1f46730744eb6db361ee858b9e5448c6ca69a83f2fec6a055bf7a43ce14e9c47", "sha256": "53e4efdf3388207d91f3e3767490172389cb92db449b951768af865b400ca7fe",
"url": "https://download.jetbrains.com/python/dataspell-2023.3.3.tar.gz", "url": "https://download.jetbrains.com/python/dataspell-2023.3.4.tar.gz",
"build_number": "233.14015.111" "build_number": "233.14475.37"
}, },
"gateway": { "gateway": {
"update-channel": "Gateway RELEASE", "update-channel": "Gateway RELEASE",
"url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz",
"version": "2023.3.3", "version": "2023.3.4",
"sha256": "411a4d964a9b12f0cd0c0eaf47eec8c8e1da85c39bb50d0794905dd490a2b18a", "sha256": "a6235d4706d594c95c34fed6f32d5ded97eae6af5b8803c47ebd0ec6ccf77a06",
"url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.3.3.tar.gz", "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.3.4.tar.gz",
"build_number": "233.14015.129" "build_number": "233.14475.30"
}, },
"goland": { "goland": {
"update-channel": "GoLand RELEASE", "update-channel": "GoLand RELEASE",
"url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz",
"version": "2023.3.3", "version": "2023.3.5",
"sha256": "18a692790f0d4e2d40cedebb954aed074f72bb67ba4bdb63b7a4cb4df2c216c7", "sha256": "bf4cacb8b9f2cc2bf5661d19f1e240debd978a6e043d7e3c2a26f0ba3b409487",
"url": "https://download.jetbrains.com/go/goland-2023.3.3.tar.gz", "url": "https://download.jetbrains.com/go/goland-2023.3.5.tar.gz",
"build_number": "233.14015.113" "build_number": "233.14808.20"
}, },
"idea-community": { "idea-community": {
"update-channel": "IntelliJ IDEA RELEASE", "update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz",
"version": "2023.3.3", "version": "2023.3.5",
"sha256": "dc123ded3c7ede89e7cd3d4d5e46fada96b8763f648cd0cdbc5b7d6e26203fd2", "sha256": "869e534533de1dbce095db6e3fee4a63a3c8fd654052089b83d08b7808495634",
"url": "https://download.jetbrains.com/idea/ideaIC-2023.3.3.tar.gz", "url": "https://download.jetbrains.com/idea/ideaIC-2023.3.5.tar.gz",
"build_number": "233.14015.106" "build_number": "233.14808.21"
}, },
"idea-ultimate": { "idea-ultimate": {
"update-channel": "IntelliJ IDEA RELEASE", "update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz",
"version": "2023.3.3", "version": "2023.3.5",
"sha256": "d9bb8259d69f57d3dd674d1a1cce9ce372d5bea7bdab9685aa466b66f04e535f", "sha256": "86f45fb2f171ac1394e2c238c06b9e6e6308ce7982465ae0b86ffded2c329ef8",
"url": "https://download.jetbrains.com/idea/ideaIU-2023.3.3.tar.gz", "url": "https://download.jetbrains.com/idea/ideaIU-2023.3.5.tar.gz",
"build_number": "233.14015.106" "build_number": "233.14808.21"
}, },
"mps": { "mps": {
"update-channel": "MPS RELEASE", "update-channel": "MPS RELEASE",
"url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz",
"version": "2023.2", "version": "2023.3",
"sha256": "10d85eee914e23691f8512745eaa044ee33e0ca784fb84a1b0a39852d5ec1014", "sha256": "7f40c6a9b29e17e29fd2acb2e0d1d31d3353e28fce31a479dd81dd1b66c1fa8c",
"url": "https://download.jetbrains.com/mps/2023.2/MPS-2023.2.tar.gz", "url": "https://download.jetbrains.com/mps/2023.3/MPS-2023.3.tar.gz",
"build_number": "232.10072.781" "build_number": "233.13135.979"
}, },
"phpstorm": { "phpstorm": {
"update-channel": "PhpStorm RELEASE", "update-channel": "PhpStorm RELEASE",
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz",
"version": "2023.3.3", "version": "2023.3.5",
"sha256": "83fae32882fdb58495f740d9e7a7d223186f2f80325892cc3cd7edad39bd200f", "sha256": "05700ce1b36c0132ff0daf9ddc129e6f2adfbfbac01a55f5881bac8bbaecf66b",
"url": "https://download.jetbrains.com/webide/PhpStorm-2023.3.3.tar.gz", "url": "https://download.jetbrains.com/webide/PhpStorm-2023.3.5.tar.gz",
"build_number": "233.14015.96", "build_number": "233.14808.18",
"version-major-minor": "2022.3" "version-major-minor": "2022.3"
}, },
"pycharm-community": { "pycharm-community": {
"update-channel": "PyCharm RELEASE", "update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz",
"version": "2023.3.3", "version": "2023.3.4",
"sha256": "f71513f428f5df3b97b09c415967ff2db3a4e7172f293e621b3f04cd1d695443", "sha256": "27546b7900c0da52baa9b14f88406c2b1244c570363e506f225bf101e65cea79",
"url": "https://download.jetbrains.com/python/pycharm-community-2023.3.3.tar.gz", "url": "https://download.jetbrains.com/python/pycharm-community-2023.3.4.tar.gz",
"build_number": "233.13763.11" "build_number": "233.14475.56"
}, },
"pycharm-professional": { "pycharm-professional": {
"update-channel": "PyCharm RELEASE", "update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz",
"version": "2023.3.3", "version": "2023.3.4",
"sha256": "29c4955410b2ea26f0cd0f44e02c8fe2b1b7dad075f0739652051faa6f84797b", "sha256": "41367c6d92f69d33c0f375e4a058fef799be00d14437402371dc8ca3e5f1161e",
"url": "https://download.jetbrains.com/python/pycharm-professional-2023.3.3.tar.gz", "url": "https://download.jetbrains.com/python/pycharm-professional-2023.3.4.tar.gz",
"build_number": "233.13763.11" "build_number": "233.14475.56"
}, },
"rider": { "rider": {
"update-channel": "Rider RELEASE", "update-channel": "Rider RELEASE",
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz",
"version": "2023.3.3", "version": "2023.3.4",
"sha256": "e4b351d90a198c473b9ae5d9427a802c8e9d923644c4aff9cc6c16ccc994ebd0", "sha256": "fb137ea346d957f151cb0d7755661293ae5e33e36f306b6dc90fb42895443309",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.3.3.tar.gz", "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.3.4.tar.gz",
"build_number": "233.14015.60" "build_number": "233.14475.66"
}, },
"ruby-mine": { "ruby-mine": {
"update-channel": "RubyMine RELEASE", "update-channel": "RubyMine RELEASE",
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz",
"version": "2023.3.3", "version": "2023.3.5",
"sha256": "a0d8533b0aad083689d61899b74e1c4405ba247b6d981c6378199106b14db74f", "sha256": "2ba00db4538fcdbe116b767666529bfe3d015592d8c41234c94cff7f17086630",
"url": "https://download.jetbrains.com/ruby/RubyMine-2023.3.3.tar.gz", "url": "https://download.jetbrains.com/ruby/RubyMine-2023.3.5.tar.gz",
"build_number": "233.14015.117" "build_number": "233.14808.14"
}, },
"rust-rover": { "rust-rover": {
"update-channel": "RustRover EAP", "update-channel": "RustRover EAP",
"url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz",
"version": "2023.3 EAP", "version": "2023.3 EAP",
"sha256": "8d3e95f563641c20109ddd7572382663202c048a49b3ee0880cf4f69457d7f29", "sha256": "51b6db1563d68326bd7c8defe1f6c04b428e1a592d06579edfeb0feb60c45077",
"url": "https://download.jetbrains.com/rustrover/RustRover-233.13135.127.tar.gz", "url": "https://download.jetbrains.com/rustrover/RustRover-233.14015.155.tar.gz",
"build_number": "233.13135.127" "build_number": "233.14015.155"
}, },
"webstorm": { "webstorm": {
"update-channel": "WebStorm RELEASE", "update-channel": "WebStorm RELEASE",
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz",
"version": "2023.3.3", "version": "2023.3.4",
"sha256": "c56ece93853aff41bc4b1fa7c40be086c8d0cb8346891ecd47a70c3978c66cd3", "sha256": "236204a90d47e0dd25002078d3f032e51e03ce6bf214a78bebd28640bdd31908",
"url": "https://download.jetbrains.com/webstorm/WebStorm-2023.3.3.tar.gz", "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.3.4.tar.gz",
"build_number": "233.14015.89" "build_number": "233.14475.40"
} }
}, },
"aarch64-linux": { "aarch64-linux": {
"clion": { "clion": {
"update-channel": "CLion RELEASE", "update-channel": "CLion RELEASE",
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz",
"version": "2023.3.3", "version": "2023.3.4",
"sha256": "1b129162abaadd6f824d036c82f013baeddb8cd002f72321c6ecb12a3ba3a9e7", "sha256": "fa427be85ead8e2769aeadf19ce816cb7f02c3b08ec3b4cc7e0cddea44386dc8",
"url": "https://download.jetbrains.com/cpp/CLion-2023.3.3-aarch64.tar.gz", "url": "https://download.jetbrains.com/cpp/CLion-2023.3.4-aarch64.tar.gz",
"build_number": "233.14015.92" "build_number": "233.14475.31"
}, },
"datagrip": { "datagrip": {
"update-channel": "DataGrip RELEASE", "update-channel": "DataGrip RELEASE",
@ -142,117 +142,117 @@
"dataspell": { "dataspell": {
"update-channel": "DataSpell RELEASE", "update-channel": "DataSpell RELEASE",
"url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.tar.gz", "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.tar.gz",
"version": "2023.3.3", "version": "2023.3.4",
"sha256": "87996adb4cf2c28ea68ebb6dbdfacfd65224446b48fbbf2ebf9dfb9627e39de2", "sha256": "3dbc17eec909f5b4c99b08f07e15c4c5f86b30c3bbffac486bb1afcecfa47782",
"url": "https://download.jetbrains.com/python/dataspell-2023.3.3-aarch64.tar.gz", "url": "https://download.jetbrains.com/python/dataspell-2023.3.4-aarch64.tar.gz",
"build_number": "233.14015.111" "build_number": "233.14475.37"
}, },
"gateway": { "gateway": {
"update-channel": "Gateway RELEASE", "update-channel": "Gateway RELEASE",
"url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.tar.gz", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.tar.gz",
"version": "2023.3.3", "version": "2023.3.4",
"sha256": "69708ad33b9a9af71beea5fe7ead6f3208b84ee673a37999f40ccff46f26a1bf", "sha256": "e429fe93c87687555eeb618d0cc11bcbf6809a1cfaf3763a260543ea5b639235",
"url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.3.3-aarch64.tar.gz", "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.3.4-aarch64.tar.gz",
"build_number": "233.14015.129" "build_number": "233.14475.30"
}, },
"goland": { "goland": {
"update-channel": "GoLand RELEASE", "update-channel": "GoLand RELEASE",
"url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz",
"version": "2023.3.3", "version": "2023.3.5",
"sha256": "dfe17fa21cbcfc7a050a03194c063aafc248876e393360dce5b90aa790082de2", "sha256": "79d2f7bca00233710546198a80eb3beb55d0524cd0015781686a2cf9bc36fce8",
"url": "https://download.jetbrains.com/go/goland-2023.3.3-aarch64.tar.gz", "url": "https://download.jetbrains.com/go/goland-2023.3.5-aarch64.tar.gz",
"build_number": "233.14015.113" "build_number": "233.14808.20"
}, },
"idea-community": { "idea-community": {
"update-channel": "IntelliJ IDEA RELEASE", "update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.tar.gz", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.tar.gz",
"version": "2023.3.3", "version": "2023.3.5",
"sha256": "9c1bd513e8687d185aa7c7fbb80a3e43949067ca312271b2d8ee5059236443fa", "sha256": "9a4f532f83becaee99d9e2c57c96f016da2d1b26c73ae8e220cc02361c222a5e",
"url": "https://download.jetbrains.com/idea/ideaIC-2023.3.3-aarch64.tar.gz", "url": "https://download.jetbrains.com/idea/ideaIC-2023.3.5-aarch64.tar.gz",
"build_number": "233.14015.106" "build_number": "233.14808.21"
}, },
"idea-ultimate": { "idea-ultimate": {
"update-channel": "IntelliJ IDEA RELEASE", "update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz",
"version": "2023.3.3", "version": "2023.3.5",
"sha256": "65e4c672f394ffd4fabc14570d95dfe05ade7fae3f056ab1e8dd902bedf166bf", "sha256": "620a164756338c49c4949dda24716b2269d88e92caddc7566d7fa8625c9ca5cb",
"url": "https://download.jetbrains.com/idea/ideaIU-2023.3.3-aarch64.tar.gz", "url": "https://download.jetbrains.com/idea/ideaIU-2023.3.5-aarch64.tar.gz",
"build_number": "233.14015.106" "build_number": "233.14808.21"
}, },
"mps": { "mps": {
"update-channel": "MPS RELEASE", "update-channel": "MPS RELEASE",
"url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz",
"version": "2023.2", "version": "2023.3",
"sha256": "10d85eee914e23691f8512745eaa044ee33e0ca784fb84a1b0a39852d5ec1014", "sha256": "7f40c6a9b29e17e29fd2acb2e0d1d31d3353e28fce31a479dd81dd1b66c1fa8c",
"url": "https://download.jetbrains.com/mps/2023.2/MPS-2023.2.tar.gz", "url": "https://download.jetbrains.com/mps/2023.3/MPS-2023.3.tar.gz",
"build_number": "232.10072.781" "build_number": "233.13135.979"
}, },
"phpstorm": { "phpstorm": {
"update-channel": "PhpStorm RELEASE", "update-channel": "PhpStorm RELEASE",
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz",
"version": "2023.3.3", "version": "2023.3.5",
"sha256": "7e1b0a6f5fe0ddf832e286544fd1fc4de9ad1d0ef1882f4b1ee4d380e49affdd", "sha256": "bd3f4eca26332ecb1e0a62ffbeee7b0d527a17229bf9998179edb8c0b1e0c524",
"url": "https://download.jetbrains.com/webide/PhpStorm-2023.3.3-aarch64.tar.gz", "url": "https://download.jetbrains.com/webide/PhpStorm-2023.3.5-aarch64.tar.gz",
"build_number": "233.14015.96", "build_number": "233.14808.18",
"version-major-minor": "2022.3" "version-major-minor": "2022.3"
}, },
"pycharm-community": { "pycharm-community": {
"update-channel": "PyCharm RELEASE", "update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.tar.gz", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.tar.gz",
"version": "2023.3.3", "version": "2023.3.4",
"sha256": "6e8340b494d73e3ff8de46a3e6e70ff8198b76c989c859faef59cc18724a36a2", "sha256": "9c9678921b118f90519ba73543c63657d262e6aa7a7fe6b2293dcd5f26943531",
"url": "https://download.jetbrains.com/python/pycharm-community-2023.3.3-aarch64.tar.gz", "url": "https://download.jetbrains.com/python/pycharm-community-2023.3.4-aarch64.tar.gz",
"build_number": "233.13763.11" "build_number": "233.14475.56"
}, },
"pycharm-professional": { "pycharm-professional": {
"update-channel": "PyCharm RELEASE", "update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.tar.gz", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.tar.gz",
"version": "2023.3.3", "version": "2023.3.4",
"sha256": "bf0d8935b316ca2ce2b27a8ee98042f50a0b69ab1a7bb7bb1278941178d54fcf", "sha256": "4800ba2575ba2b277785f9d3c9fce05d552c623b41db220f7dfdd886874b7042",
"url": "https://download.jetbrains.com/python/pycharm-professional-2023.3.3-aarch64.tar.gz", "url": "https://download.jetbrains.com/python/pycharm-professional-2023.3.4-aarch64.tar.gz",
"build_number": "233.13763.11" "build_number": "233.14475.56"
}, },
"rider": { "rider": {
"update-channel": "Rider RELEASE", "update-channel": "Rider RELEASE",
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.tar.gz", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.tar.gz",
"version": "2023.3.3", "version": "2023.3.4",
"sha256": "72681b8627b10d4e23177e729d37ee96f870442edd12d4306b9406d95446d420", "sha256": "99c80997bd0d2b8b918ef81fbbe7b422e165665c8fa3d108b1387ca0188c9558",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.3.3-aarch64.tar.gz", "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.3.4-aarch64.tar.gz",
"build_number": "233.14015.60" "build_number": "233.14475.66"
}, },
"ruby-mine": { "ruby-mine": {
"update-channel": "RubyMine RELEASE", "update-channel": "RubyMine RELEASE",
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.tar.gz", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.tar.gz",
"version": "2023.3.3", "version": "2023.3.5",
"sha256": "cb8ef50e2a5abdca78a713584798851bf736af2b1a67c861f8a750a09d3631ad", "sha256": "91fd717d04512170e181fd77f7cd0a63ef10e4f510a81d124d67a82d5d82a5d8",
"url": "https://download.jetbrains.com/ruby/RubyMine-2023.3.3-aarch64.tar.gz", "url": "https://download.jetbrains.com/ruby/RubyMine-2023.3.5-aarch64.tar.gz",
"build_number": "233.14015.117" "build_number": "233.14808.14"
}, },
"rust-rover": { "rust-rover": {
"update-channel": "RustRover EAP", "update-channel": "RustRover EAP",
"url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz",
"version": "2023.3 EAP", "version": "2023.3 EAP",
"sha256": "f99755d11d410ba453e1ef70a22aed15a02da292933222de64067b4f2d3cdcef", "sha256": "d71b4d2eb3769a3acc2ebb3b3324ca376b86eb6788bf9e85467db8ee60f006c7",
"url": "https://download.jetbrains.com/rustrover/RustRover-233.13135.127-aarch64.tar.gz", "url": "https://download.jetbrains.com/rustrover/RustRover-233.14015.155-aarch64.tar.gz",
"build_number": "233.13135.127" "build_number": "233.14015.155"
}, },
"webstorm": { "webstorm": {
"update-channel": "WebStorm RELEASE", "update-channel": "WebStorm RELEASE",
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz",
"version": "2023.3.3", "version": "2023.3.4",
"sha256": "14fe97e2ed2b7a2c283266159d571f955631abb527b2c728e4b837cdacf2a5fc", "sha256": "2e072ee801d07961079ef183dec13561726e2c38df68e35fe4be51d8caac585c",
"url": "https://download.jetbrains.com/webstorm/WebStorm-2023.3.3-aarch64.tar.gz", "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.3.4-aarch64.tar.gz",
"build_number": "233.14015.89" "build_number": "233.14475.40"
} }
}, },
"x86_64-darwin": { "x86_64-darwin": {
"clion": { "clion": {
"update-channel": "CLion RELEASE", "update-channel": "CLion RELEASE",
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg",
"version": "2023.3.3", "version": "2023.3.4",
"sha256": "ad93d0e6b8e580db3063e36c349fd470cc47766d51287569b87b3e947463aa55", "sha256": "2eb149d2bbf1c778f3386bc9cf7b11741b4372e69c680def31260b9aa213159e",
"url": "https://download.jetbrains.com/cpp/CLion-2023.3.3.dmg", "url": "https://download.jetbrains.com/cpp/CLion-2023.3.4.dmg",
"build_number": "233.14015.92" "build_number": "233.14475.31"
}, },
"datagrip": { "datagrip": {
"update-channel": "DataGrip RELEASE", "update-channel": "DataGrip RELEASE",
@ -265,117 +265,117 @@
"dataspell": { "dataspell": {
"update-channel": "DataSpell RELEASE", "update-channel": "DataSpell RELEASE",
"url-template": "https://download.jetbrains.com/python/dataspell-{version}.dmg", "url-template": "https://download.jetbrains.com/python/dataspell-{version}.dmg",
"version": "2023.3.3", "version": "2023.3.4",
"sha256": "fb302153ce044e8b6bb4df5935e25d4464bffe690bd2b94ef2d60b18299ec8b2", "sha256": "8bc75545a3c502a98e6e8360ab4d0e7639979456d87ec7cb508344d7e3066955",
"url": "https://download.jetbrains.com/python/dataspell-2023.3.3.dmg", "url": "https://download.jetbrains.com/python/dataspell-2023.3.4.dmg",
"build_number": "233.14015.111" "build_number": "233.14475.37"
}, },
"gateway": { "gateway": {
"update-channel": "Gateway RELEASE", "update-channel": "Gateway RELEASE",
"url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg",
"version": "2023.3.3", "version": "2023.3.4",
"sha256": "9a96c387bcd0ba9d84fd53ba2ae37d0370809d27a0fdb63e18664fdf5ee7f53f", "sha256": "5cf8720e0259c2bfd2474a5fd1db329cb48c10a8823ba0c29b0f3bde3ddbdf8a",
"url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.3.3.dmg", "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.3.4.dmg",
"build_number": "233.14015.129" "build_number": "233.14475.30"
}, },
"goland": { "goland": {
"update-channel": "GoLand RELEASE", "update-channel": "GoLand RELEASE",
"url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg",
"version": "2023.3.3", "version": "2023.3.5",
"sha256": "2e459e390988e2d196add580c8cbfce8132ef0a4d55709d7495cb65a195ed4f9", "sha256": "2d76043909619e7fc59d87cda6c17fac03acaafc20f7a30da0219ef57415386f",
"url": "https://download.jetbrains.com/go/goland-2023.3.3.dmg", "url": "https://download.jetbrains.com/go/goland-2023.3.5.dmg",
"build_number": "233.14015.113" "build_number": "233.14808.20"
}, },
"idea-community": { "idea-community": {
"update-channel": "IntelliJ IDEA RELEASE", "update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg",
"version": "2023.3.3", "version": "2023.3.5",
"sha256": "291308af0dcb276dd2103affb4cdfb55c29135eb411fed2ac6f5a73270525688", "sha256": "f9ac332146ea4eb01b2d3789c042d62a024c6ccedb7e15bf9b09f506ef0663ac",
"url": "https://download.jetbrains.com/idea/ideaIC-2023.3.3.dmg", "url": "https://download.jetbrains.com/idea/ideaIC-2023.3.5.dmg",
"build_number": "233.14015.106" "build_number": "233.14808.21"
}, },
"idea-ultimate": { "idea-ultimate": {
"update-channel": "IntelliJ IDEA RELEASE", "update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg",
"version": "2023.3.3", "version": "2023.3.5",
"sha256": "48ea080e2e444bd6f9c27f9d9e958df4d09bc4df98457cf2ebf7f25a4a2cded9", "sha256": "e31b7b572cb3e908e325707873d1cba53ccff0032c1876cfd7d1d998f247629b",
"url": "https://download.jetbrains.com/idea/ideaIU-2023.3.3.dmg", "url": "https://download.jetbrains.com/idea/ideaIU-2023.3.5.dmg",
"build_number": "233.14015.106" "build_number": "233.14808.21"
}, },
"mps": { "mps": {
"update-channel": "MPS RELEASE", "update-channel": "MPS RELEASE",
"url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos.dmg", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos.dmg",
"version": "2023.2", "version": "2023.3",
"sha256": "11a635432beaca5809fe0253303d07444a0bfd6fac287c72e7b03e7a9f1a59e4", "sha256": "c1e46dcb3429772b164f423cedc644f388217d1e7310d682b2341f9e744333bf",
"url": "https://download.jetbrains.com/mps/2023.2/MPS-2023.2-macos.dmg", "url": "https://download.jetbrains.com/mps/2023.3/MPS-2023.3-macos.dmg",
"build_number": "232.10072.781" "build_number": "233.13135.979"
}, },
"phpstorm": { "phpstorm": {
"update-channel": "PhpStorm RELEASE", "update-channel": "PhpStorm RELEASE",
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg",
"version": "2023.3.3", "version": "2023.3.5",
"sha256": "082d432eb363b274fa4eea2f743518dfcf29deb0e7be34f64152d5b114415daf", "sha256": "536836776189c54f6ba6dc61c344758ba1bc5c8b6191d09c69cfaeaa11ef33dd",
"url": "https://download.jetbrains.com/webide/PhpStorm-2023.3.3.dmg", "url": "https://download.jetbrains.com/webide/PhpStorm-2023.3.5.dmg",
"build_number": "233.14015.96", "build_number": "233.14808.18",
"version-major-minor": "2022.3" "version-major-minor": "2022.3"
}, },
"pycharm-community": { "pycharm-community": {
"update-channel": "PyCharm RELEASE", "update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg",
"version": "2023.3.3", "version": "2023.3.4",
"sha256": "b42894264cf0f14fe5a93807999c89870c6709e3f1edf9d629ea74c151825451", "sha256": "492268d99fec38fa81bd02772ed57b243403ecad1f5f28b3a1150502cf8b4a6c",
"url": "https://download.jetbrains.com/python/pycharm-community-2023.3.3.dmg", "url": "https://download.jetbrains.com/python/pycharm-community-2023.3.4.dmg",
"build_number": "233.13763.11" "build_number": "233.14475.56"
}, },
"pycharm-professional": { "pycharm-professional": {
"update-channel": "PyCharm RELEASE", "update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg",
"version": "2023.3.3", "version": "2023.3.4",
"sha256": "c86b6e279ac6a82ce79e187c96b671c1b3bbb6cc2c7c5686454705316b398e9c", "sha256": "59512bbe61a9332f02e78d34b85ab2563b5dac2fa9882519ed27cfcbccef5dc2",
"url": "https://download.jetbrains.com/python/pycharm-professional-2023.3.3.dmg", "url": "https://download.jetbrains.com/python/pycharm-professional-2023.3.4.dmg",
"build_number": "233.13763.11" "build_number": "233.14475.56"
}, },
"rider": { "rider": {
"update-channel": "Rider RELEASE", "update-channel": "Rider RELEASE",
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg",
"version": "2023.3.3", "version": "2023.3.4",
"sha256": "a90346a30523eaa2e3abf57abd3949f46e0c6e6d2ea0c62c36d40b07061626cb", "sha256": "00435dc8d9dd43bbd73a55be7d5b304be8ee124032a7485750aef86cddc53ba2",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.3.3.dmg", "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.3.4.dmg",
"build_number": "233.14015.60" "build_number": "233.14475.66"
}, },
"ruby-mine": { "ruby-mine": {
"update-channel": "RubyMine RELEASE", "update-channel": "RubyMine RELEASE",
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg",
"version": "2023.3.3", "version": "2023.3.5",
"sha256": "5fcba619de2c19b969aa6ce200c859a196de6597476cd9c31b8ffef415486b8b", "sha256": "bb25d2e10187c87b809c9ce06ca5d05eb3675dd33bff587b3249117f4c290d01",
"url": "https://download.jetbrains.com/ruby/RubyMine-2023.3.3.dmg", "url": "https://download.jetbrains.com/ruby/RubyMine-2023.3.5.dmg",
"build_number": "233.14015.117" "build_number": "233.14808.14"
}, },
"rust-rover": { "rust-rover": {
"update-channel": "RustRover EAP", "update-channel": "RustRover EAP",
"url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg",
"version": "2023.3 EAP", "version": "2023.3 EAP",
"sha256": "f52d5ed316e92ff259aa097fce6c4d8985567373f08d2551ecfa49970c3b3c21", "sha256": "ceb2f78f0d018b66a2f81ad0e2facc7717e4d2f0fe0a3d3ef9277269afb64dee",
"url": "https://download.jetbrains.com/rustrover/RustRover-233.13135.127.dmg", "url": "https://download.jetbrains.com/rustrover/RustRover-233.14015.155.dmg",
"build_number": "233.13135.127" "build_number": "233.14015.155"
}, },
"webstorm": { "webstorm": {
"update-channel": "WebStorm RELEASE", "update-channel": "WebStorm RELEASE",
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg",
"version": "2023.3.3", "version": "2023.3.4",
"sha256": "e576a6adeda21bff4eb4bb7d250bb30ba4e773e9bd8728b05fa6d6dc6eea6756", "sha256": "5c7f2b3194bf49712456466bfdc58f20bd434f00128c4964d82e9744ee114cf8",
"url": "https://download.jetbrains.com/webstorm/WebStorm-2023.3.3.dmg", "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.3.4.dmg",
"build_number": "233.14015.89" "build_number": "233.14475.40"
} }
}, },
"aarch64-darwin": { "aarch64-darwin": {
"clion": { "clion": {
"update-channel": "CLion RELEASE", "update-channel": "CLion RELEASE",
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg", "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg",
"version": "2023.3.3", "version": "2023.3.4",
"sha256": "4f8d01238149ae479e07762063011fd9b4b7c5c2ae355348810691d51f646bfb", "sha256": "340d239008c38743a10e51ae609ec3bf3dd732cf2042ef997532c6b8ed272b1a",
"url": "https://download.jetbrains.com/cpp/CLion-2023.3.3-aarch64.dmg", "url": "https://download.jetbrains.com/cpp/CLion-2023.3.4-aarch64.dmg",
"build_number": "233.14015.92" "build_number": "233.14475.31"
}, },
"datagrip": { "datagrip": {
"update-channel": "DataGrip RELEASE", "update-channel": "DataGrip RELEASE",
@ -388,107 +388,107 @@
"dataspell": { "dataspell": {
"update-channel": "DataSpell RELEASE", "update-channel": "DataSpell RELEASE",
"url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg", "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg",
"version": "2023.3.3", "version": "2023.3.4",
"sha256": "db05a2acc6a5a15b1bca9e8f68b96f975d8860df35b1bd37c0d5803af4080ee0", "sha256": "2b87177f16dc4d31ff0dcf7206e03da3ff811c88ad18711170ca263e02d6ffa5",
"url": "https://download.jetbrains.com/python/dataspell-2023.3.3-aarch64.dmg", "url": "https://download.jetbrains.com/python/dataspell-2023.3.4-aarch64.dmg",
"build_number": "233.14015.111" "build_number": "233.14475.37"
}, },
"gateway": { "gateway": {
"update-channel": "Gateway RELEASE", "update-channel": "Gateway RELEASE",
"url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg",
"version": "2023.3.3", "version": "2023.3.4",
"sha256": "ec6150b6336d831a03ad7336bedc70d7c6f319f958bbf012c59671db42764173", "sha256": "2e769fd9c28b33d34845d1b92cb12a13578f2d4c2f255c88a42fcb79a7cf848f",
"url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.3.3-aarch64.dmg", "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.3.4-aarch64.dmg",
"build_number": "233.14015.129" "build_number": "233.14475.30"
}, },
"goland": { "goland": {
"update-channel": "GoLand RELEASE", "update-channel": "GoLand RELEASE",
"url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg",
"version": "2023.3.3", "version": "2023.3.5",
"sha256": "4b192b5a59d86ca8f20377d7905e8a91aa1f53e99bb868ff74d9d0959b54d9c4", "sha256": "2addb56238a56fc91fe6bbbaa5d7ae1d7adc223abb1a12e2575abf85425d1e54",
"url": "https://download.jetbrains.com/go/goland-2023.3.3-aarch64.dmg", "url": "https://download.jetbrains.com/go/goland-2023.3.5-aarch64.dmg",
"build_number": "233.14015.113" "build_number": "233.14808.20"
}, },
"idea-community": { "idea-community": {
"update-channel": "IntelliJ IDEA RELEASE", "update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg", "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg",
"version": "2023.3.3", "version": "2023.3.5",
"sha256": "dad35642f993830970975ed81c7b04f89171dba0dde9e4ccf7ea29b24392603f", "sha256": "f1f3d2585e4dceff80e5e5ac5e532e5cc94bd6711167c429c3d3c7a6b3c81f09",
"url": "https://download.jetbrains.com/idea/ideaIC-2023.3.3-aarch64.dmg", "url": "https://download.jetbrains.com/idea/ideaIC-2023.3.5-aarch64.dmg",
"build_number": "233.14015.106" "build_number": "233.14808.21"
}, },
"idea-ultimate": { "idea-ultimate": {
"update-channel": "IntelliJ IDEA RELEASE", "update-channel": "IntelliJ IDEA RELEASE",
"url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg", "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg",
"version": "2023.3.3", "version": "2023.3.5",
"sha256": "ccd1dc932b3bdfabe629c38a85716ce561dbf0f4512533a62acc503648dbaa22", "sha256": "a81096a8f697967df1a2c8564267df81bbee24d88a10011dc3e4340efb66461a",
"url": "https://download.jetbrains.com/idea/ideaIU-2023.3.3-aarch64.dmg", "url": "https://download.jetbrains.com/idea/ideaIU-2023.3.5-aarch64.dmg",
"build_number": "233.14015.106" "build_number": "233.14808.21"
}, },
"mps": { "mps": {
"update-channel": "MPS RELEASE", "update-channel": "MPS RELEASE",
"url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos-aarch64.dmg", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos-aarch64.dmg",
"version": "2023.2", "version": "2023.3",
"url": "https://download.jetbrains.com/mps/2023.2/MPS-2023.2-macos-aarch64.dmg", "url": "https://download.jetbrains.com/mps/2023.3/MPS-2023.3-macos-aarch64.dmg",
"sha256": "a19ecd8a109783e9d2260cc18f48ac97e52a0bc00ee29df5ccf711a80d1701eb", "sha256": "133e5bae81d675a6ee7780efec18dd96dfed059dbfdd2ad4a1028d9956a1ec6e",
"build_number": "232.10072.781" "build_number": "233.13135.979"
}, },
"phpstorm": { "phpstorm": {
"update-channel": "PhpStorm RELEASE", "update-channel": "PhpStorm RELEASE",
"url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg",
"version": "2023.3.3", "version": "2023.3.5",
"sha256": "052bf5e1676410b0ce25574c57c56470ee3d2d8f4b0d776c1de6bb841a6eb3bd", "sha256": "6b4da9083d0e4bd9725c7394981de66e9a633ad797dfb771baf65887b8d18471",
"url": "https://download.jetbrains.com/webide/PhpStorm-2023.3.3-aarch64.dmg", "url": "https://download.jetbrains.com/webide/PhpStorm-2023.3.5-aarch64.dmg",
"build_number": "233.14015.96", "build_number": "233.14808.18",
"version-major-minor": "2022.3" "version-major-minor": "2022.3"
}, },
"pycharm-community": { "pycharm-community": {
"update-channel": "PyCharm RELEASE", "update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg",
"version": "2023.3.3", "version": "2023.3.4",
"sha256": "1e4dd6fb00d7557ba381406279818a3e7892027eff0fbb1b6cdf4b112c47899e", "sha256": "885ed6dcb7b99147e345ce2d088e2636e8317a5e71ff67e9bc9d0f770266646e",
"url": "https://download.jetbrains.com/python/pycharm-community-2023.3.3-aarch64.dmg", "url": "https://download.jetbrains.com/python/pycharm-community-2023.3.4-aarch64.dmg",
"build_number": "233.13763.11" "build_number": "233.14475.56"
}, },
"pycharm-professional": { "pycharm-professional": {
"update-channel": "PyCharm RELEASE", "update-channel": "PyCharm RELEASE",
"url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg",
"version": "2023.3.3", "version": "2023.3.4",
"sha256": "84fb09938539dc2f7ecfbd9be20a916cf542fc4e0b69a319d17e4180e4d6a244", "sha256": "58dbf1628f59950d40be4ed73199ce92ef36be6735823d9566135ddea16c1718",
"url": "https://download.jetbrains.com/python/pycharm-professional-2023.3.3-aarch64.dmg", "url": "https://download.jetbrains.com/python/pycharm-professional-2023.3.4-aarch64.dmg",
"build_number": "233.13763.11" "build_number": "233.14475.56"
}, },
"rider": { "rider": {
"update-channel": "Rider RELEASE", "update-channel": "Rider RELEASE",
"url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg", "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg",
"version": "2023.3.3", "version": "2023.3.4",
"sha256": "2d6d425610a8d14616cf9a18a0048d678164fcc45f4f5a8ee3fff695012a0c43", "sha256": "8ffd13dcc2207d4a781dc92e89643767e0dd6ef53024c92669f4daaf9cf929c0",
"url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.3.3-aarch64.dmg", "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2023.3.4-aarch64.dmg",
"build_number": "233.14015.60" "build_number": "233.14475.66"
}, },
"ruby-mine": { "ruby-mine": {
"update-channel": "RubyMine RELEASE", "update-channel": "RubyMine RELEASE",
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg", "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg",
"version": "2023.3.3", "version": "2023.3.5",
"sha256": "1e9b62b495709c5d40af0aa9e5bdca21658dc23339659bcc3d5666ef45686281", "sha256": "1ea4720ef6559a52901e8627dd100f25951419ab4ce592f602e5bb2359027b6b",
"url": "https://download.jetbrains.com/ruby/RubyMine-2023.3.3-aarch64.dmg", "url": "https://download.jetbrains.com/ruby/RubyMine-2023.3.5-aarch64.dmg",
"build_number": "233.14015.117" "build_number": "233.14808.14"
}, },
"rust-rover": { "rust-rover": {
"update-channel": "RustRover EAP", "update-channel": "RustRover EAP",
"url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg", "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg",
"version": "2023.3 EAP", "version": "2023.3 EAP",
"sha256": "dc4edbd94363753084dbf2dfbeff6a13af681465e3ece8b60b2382b11e516793", "sha256": "13c986d075c78e6a81db489247fc542014ad46da7cc7bd6fa1710be047ef0884",
"url": "https://download.jetbrains.com/rustrover/RustRover-233.13135.127-aarch64.dmg", "url": "https://download.jetbrains.com/rustrover/RustRover-233.14015.155-aarch64.dmg",
"build_number": "233.13135.127" "build_number": "233.14015.155"
}, },
"webstorm": { "webstorm": {
"update-channel": "WebStorm RELEASE", "update-channel": "WebStorm RELEASE",
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg", "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg",
"version": "2023.3.3", "version": "2023.3.4",
"sha256": "30b9c45af873991c0d2dca508b42e61fa6a7ea752ac00bb93c1e519d15ef277c", "sha256": "e8abaf52bc68a9da2873897de4f1aa89510323d4a12dc32fa98b192bc4eae5bc",
"url": "https://download.jetbrains.com/webstorm/WebStorm-2023.3.3-aarch64.dmg", "url": "https://download.jetbrains.com/webstorm/WebStorm-2023.3.4-aarch64.dmg",
"build_number": "233.14015.89" "build_number": "233.14475.40"
} }
} }
} }

View File

@ -240,8 +240,6 @@ rec {
--replace-needed libssl.so.10 libssl.so \ --replace-needed libssl.so.10 libssl.so \
--replace-needed libcrypto.so.10 libcrypto.so --replace-needed libcrypto.so.10 libcrypto.so
interp="$(cat $NIX_CC/nix-support/dynamic-linker)"
patchelf --set-interpreter $interp $PWD/plugins/intellij-rust/bin/linux/*/intellij-rust-native-helper
chmod +x $PWD/plugins/intellij-rust/bin/linux/*/intellij-rust-native-helper chmod +x $PWD/plugins/intellij-rust/bin/linux/*/intellij-rust-native-helper
) )
''; '';

View File

@ -17,17 +17,17 @@
"webstorm" "webstorm"
], ],
"builds": { "builds": {
"232.10072.781": "https://plugins.jetbrains.com/files/164/442850/IdeaVim-2.7.5-signed.zip", "233.13135.979": "https://plugins.jetbrains.com/files/164/491097/IdeaVim-2.9.1-signed.zip",
"233.13135.127": "https://plugins.jetbrains.com/files/164/479004/IdeaVim-2.8.2-signed.zip", "233.14015.137": "https://plugins.jetbrains.com/files/164/491097/IdeaVim-2.9.1-signed.zip",
"233.13763.11": "https://plugins.jetbrains.com/files/164/479004/IdeaVim-2.8.2-signed.zip", "233.14015.155": "https://plugins.jetbrains.com/files/164/491097/IdeaVim-2.9.1-signed.zip",
"233.14015.106": "https://plugins.jetbrains.com/files/164/479004/IdeaVim-2.8.2-signed.zip", "233.14475.31": "https://plugins.jetbrains.com/files/164/491097/IdeaVim-2.9.1-signed.zip",
"233.14015.113": "https://plugins.jetbrains.com/files/164/479004/IdeaVim-2.8.2-signed.zip", "233.14475.40": "https://plugins.jetbrains.com/files/164/491097/IdeaVim-2.9.1-signed.zip",
"233.14015.117": "https://plugins.jetbrains.com/files/164/479004/IdeaVim-2.8.2-signed.zip", "233.14475.56": "https://plugins.jetbrains.com/files/164/491097/IdeaVim-2.9.1-signed.zip",
"233.14015.137": "https://plugins.jetbrains.com/files/164/479004/IdeaVim-2.8.2-signed.zip", "233.14475.66": "https://plugins.jetbrains.com/files/164/491097/IdeaVim-2.9.1-signed.zip",
"233.14015.60": "https://plugins.jetbrains.com/files/164/479004/IdeaVim-2.8.2-signed.zip", "233.14808.14": "https://plugins.jetbrains.com/files/164/491097/IdeaVim-2.9.1-signed.zip",
"233.14015.89": "https://plugins.jetbrains.com/files/164/479004/IdeaVim-2.8.2-signed.zip", "233.14808.18": "https://plugins.jetbrains.com/files/164/491097/IdeaVim-2.9.1-signed.zip",
"233.14015.92": "https://plugins.jetbrains.com/files/164/479004/IdeaVim-2.8.2-signed.zip", "233.14808.20": "https://plugins.jetbrains.com/files/164/491097/IdeaVim-2.9.1-signed.zip",
"233.14015.96": "https://plugins.jetbrains.com/files/164/479004/IdeaVim-2.8.2-signed.zip" "233.14808.21": "https://plugins.jetbrains.com/files/164/491097/IdeaVim-2.9.1-signed.zip"
}, },
"name": "ideavim" "name": "ideavim"
}, },
@ -36,7 +36,7 @@
"idea-ultimate" "idea-ultimate"
], ],
"builds": { "builds": {
"233.14015.106": "https://plugins.jetbrains.com/files/631/474316/python-233.14015.106.zip" "233.14808.21": "https://plugins.jetbrains.com/files/631/502576/python-233.14808.21.zip"
}, },
"name": "python" "name": "python"
}, },
@ -47,8 +47,8 @@
"mps" "mps"
], ],
"builds": { "builds": {
"232.10072.781": "https://plugins.jetbrains.com/files/6954/459286/kotlin-plugin-232-1.9.22-release-704-IJ10072.27.zip", "233.13135.979": null,
"233.14015.106": null "233.14808.21": null
}, },
"name": "kotlin" "name": "kotlin"
}, },
@ -69,17 +69,17 @@
"webstorm" "webstorm"
], ],
"builds": { "builds": {
"232.10072.781": null, "233.13135.979": null,
"233.13135.127": "https://plugins.jetbrains.com/files/6981/464477/ini-233.13135.116.zip", "233.14015.137": null,
"233.13763.11": "https://plugins.jetbrains.com/files/6981/468089/ini-233.13763.5.zip", "233.14015.155": null,
"233.14015.106": "https://plugins.jetbrains.com/files/6981/474956/ini-233.14015.113.zip", "233.14475.31": "https://plugins.jetbrains.com/files/6981/487357/ini-233.14475.38.zip",
"233.14015.113": "https://plugins.jetbrains.com/files/6981/474956/ini-233.14015.113.zip", "233.14475.40": "https://plugins.jetbrains.com/files/6981/487357/ini-233.14475.38.zip",
"233.14015.117": "https://plugins.jetbrains.com/files/6981/474956/ini-233.14015.113.zip", "233.14475.56": "https://plugins.jetbrains.com/files/6981/487357/ini-233.14475.38.zip",
"233.14015.137": "https://plugins.jetbrains.com/files/6981/474956/ini-233.14015.113.zip", "233.14475.66": "https://plugins.jetbrains.com/files/6981/487357/ini-233.14475.38.zip",
"233.14015.60": "https://plugins.jetbrains.com/files/6981/474956/ini-233.14015.113.zip", "233.14808.14": "https://plugins.jetbrains.com/files/6981/502555/ini-233.14808.20.zip",
"233.14015.89": "https://plugins.jetbrains.com/files/6981/474956/ini-233.14015.113.zip", "233.14808.18": "https://plugins.jetbrains.com/files/6981/502555/ini-233.14808.20.zip",
"233.14015.92": "https://plugins.jetbrains.com/files/6981/474956/ini-233.14015.113.zip", "233.14808.20": "https://plugins.jetbrains.com/files/6981/502555/ini-233.14808.20.zip",
"233.14015.96": "https://plugins.jetbrains.com/files/6981/474956/ini-233.14015.113.zip" "233.14808.21": "https://plugins.jetbrains.com/files/6981/502555/ini-233.14808.20.zip"
}, },
"name": "ini" "name": "ini"
}, },
@ -89,8 +89,8 @@
"phpstorm" "phpstorm"
], ],
"builds": { "builds": {
"233.14015.106": "https://plugins.jetbrains.com/files/7219/467592/Symfony_Plugin-2022.1.263.zip", "233.14808.18": "https://plugins.jetbrains.com/files/7219/497847/Symfony_Plugin-2023.1.265.zip",
"233.14015.96": "https://plugins.jetbrains.com/files/7219/467592/Symfony_Plugin-2022.1.263.zip" "233.14808.21": "https://plugins.jetbrains.com/files/7219/497847/Symfony_Plugin-2023.1.265.zip"
}, },
"name": "symfony-support" "name": "symfony-support"
}, },
@ -100,8 +100,8 @@
"phpstorm" "phpstorm"
], ],
"builds": { "builds": {
"233.14015.106": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip", "233.14808.18": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip",
"233.14015.96": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip" "233.14808.21": "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip"
}, },
"name": "php-annotations" "name": "php-annotations"
}, },
@ -114,11 +114,11 @@
"rust-rover" "rust-rover"
], ],
"builds": { "builds": {
"233.13135.127": "https://plugins.jetbrains.com/files/7322/456914/python-ce-233.13135.103.zip",
"233.14015.106": "https://plugins.jetbrains.com/files/7322/474341/python-ce-233.14015.106.zip",
"233.14015.113": "https://plugins.jetbrains.com/files/7322/474341/python-ce-233.14015.106.zip",
"233.14015.137": "https://plugins.jetbrains.com/files/7322/474341/python-ce-233.14015.106.zip", "233.14015.137": "https://plugins.jetbrains.com/files/7322/474341/python-ce-233.14015.106.zip",
"233.14015.60": "https://plugins.jetbrains.com/files/7322/474341/python-ce-233.14015.106.zip" "233.14015.155": "https://plugins.jetbrains.com/files/7322/474341/python-ce-233.14015.106.zip",
"233.14475.66": "https://plugins.jetbrains.com/files/7322/484110/python-ce-233.14475.9.zip",
"233.14808.20": "https://plugins.jetbrains.com/files/7322/502153/python-ce-233.14808.12.zip",
"233.14808.21": "https://plugins.jetbrains.com/files/7322/502153/python-ce-233.14808.12.zip"
}, },
"name": "python-community-edition" "name": "python-community-edition"
}, },
@ -138,16 +138,16 @@
"webstorm" "webstorm"
], ],
"builds": { "builds": {
"232.10072.781": "https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip", "233.13135.979": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip",
"233.13763.11": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip",
"233.14015.106": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip",
"233.14015.113": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip",
"233.14015.117": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip",
"233.14015.137": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip", "233.14015.137": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip",
"233.14015.60": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip", "233.14475.31": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip",
"233.14015.89": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip", "233.14475.40": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip",
"233.14015.92": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip", "233.14475.56": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip",
"233.14015.96": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip" "233.14475.66": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip",
"233.14808.14": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip",
"233.14808.18": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip",
"233.14808.20": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip",
"233.14808.21": "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip"
}, },
"name": "-deprecated-rust" "name": "-deprecated-rust"
}, },
@ -167,16 +167,16 @@
"webstorm" "webstorm"
], ],
"builds": { "builds": {
"232.10072.781": "https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip", "233.13135.979": null,
"233.13763.11": null,
"233.14015.106": null,
"233.14015.113": null,
"233.14015.117": null,
"233.14015.137": null, "233.14015.137": null,
"233.14015.60": null, "233.14475.31": null,
"233.14015.89": null, "233.14475.40": null,
"233.14015.92": null, "233.14475.56": null,
"233.14015.96": null "233.14475.66": null,
"233.14808.14": null,
"233.14808.18": null,
"233.14808.20": null,
"233.14808.21": null
}, },
"name": "-deprecated-rust-beta" "name": "-deprecated-rust-beta"
}, },
@ -190,10 +190,10 @@
"ruby-mine" "ruby-mine"
], ],
"builds": { "builds": {
"233.13763.11": "https://plugins.jetbrains.com/files/8554/454574/featuresTrainer-233.13135.67.zip", "233.14475.56": "https://plugins.jetbrains.com/files/8554/469535/featuresTrainer-233.14015.29.zip",
"233.14015.106": "https://plugins.jetbrains.com/files/8554/469535/featuresTrainer-233.14015.29.zip", "233.14808.14": "https://plugins.jetbrains.com/files/8554/469535/featuresTrainer-233.14015.29.zip",
"233.14015.113": "https://plugins.jetbrains.com/files/8554/469535/featuresTrainer-233.14015.29.zip", "233.14808.20": "https://plugins.jetbrains.com/files/8554/469535/featuresTrainer-233.14015.29.zip",
"233.14015.117": "https://plugins.jetbrains.com/files/8554/469535/featuresTrainer-233.14015.29.zip" "233.14808.21": "https://plugins.jetbrains.com/files/8554/469535/featuresTrainer-233.14015.29.zip"
}, },
"name": "ide-features-trainer" "name": "ide-features-trainer"
}, },
@ -214,17 +214,17 @@
"webstorm" "webstorm"
], ],
"builds": { "builds": {
"232.10072.781": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip", "233.13135.979": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip",
"233.13135.127": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip",
"233.13763.11": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip",
"233.14015.106": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip",
"233.14015.113": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip",
"233.14015.117": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip",
"233.14015.137": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip", "233.14015.137": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip",
"233.14015.60": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip", "233.14015.155": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip",
"233.14015.89": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip", "233.14475.31": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip",
"233.14015.92": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip", "233.14475.40": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip",
"233.14015.96": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip" "233.14475.56": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip",
"233.14475.66": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip",
"233.14808.14": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip",
"233.14808.18": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip",
"233.14808.20": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip",
"233.14808.21": "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip"
}, },
"name": "nixidea" "name": "nixidea"
}, },
@ -234,8 +234,8 @@
"idea-ultimate" "idea-ultimate"
], ],
"builds": { "builds": {
"233.14015.106": "https://plugins.jetbrains.com/files/9568/474312/go-plugin-233.14015.106.zip", "233.14808.20": "https://plugins.jetbrains.com/files/9568/502583/go-plugin-233.14808.21.zip",
"233.14015.113": "https://plugins.jetbrains.com/files/9568/474312/go-plugin-233.14015.106.zip" "233.14808.21": "https://plugins.jetbrains.com/files/9568/502583/go-plugin-233.14808.21.zip"
}, },
"name": "go" "name": "go"
}, },
@ -256,17 +256,17 @@
"webstorm" "webstorm"
], ],
"builds": { "builds": {
"232.10072.781": "https://plugins.jetbrains.com/files/10037/432491/CSVEditor-3.2.3-232.zip", "233.13135.979": "https://plugins.jetbrains.com/files/10037/493012/CSVEditor-3.3.0-233.zip",
"233.13135.127": "https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip", "233.14015.137": "https://plugins.jetbrains.com/files/10037/493012/CSVEditor-3.3.0-233.zip",
"233.13763.11": "https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip", "233.14015.155": "https://plugins.jetbrains.com/files/10037/493012/CSVEditor-3.3.0-233.zip",
"233.14015.106": "https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip", "233.14475.31": "https://plugins.jetbrains.com/files/10037/493012/CSVEditor-3.3.0-233.zip",
"233.14015.113": "https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip", "233.14475.40": "https://plugins.jetbrains.com/files/10037/493012/CSVEditor-3.3.0-233.zip",
"233.14015.117": "https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip", "233.14475.56": "https://plugins.jetbrains.com/files/10037/493012/CSVEditor-3.3.0-233.zip",
"233.14015.137": "https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip", "233.14475.66": "https://plugins.jetbrains.com/files/10037/493012/CSVEditor-3.3.0-233.zip",
"233.14015.60": "https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip", "233.14808.14": "https://plugins.jetbrains.com/files/10037/493012/CSVEditor-3.3.0-233.zip",
"233.14015.89": "https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip", "233.14808.18": "https://plugins.jetbrains.com/files/10037/493012/CSVEditor-3.3.0-233.zip",
"233.14015.92": "https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip", "233.14808.20": "https://plugins.jetbrains.com/files/10037/493012/CSVEditor-3.3.0-233.zip",
"233.14015.96": "https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip" "233.14808.21": "https://plugins.jetbrains.com/files/10037/493012/CSVEditor-3.3.0-233.zip"
}, },
"name": "csv-editor" "name": "csv-editor"
}, },
@ -287,17 +287,17 @@
"webstorm" "webstorm"
], ],
"builds": { "builds": {
"232.10072.781": "https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip", "233.13135.979": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip",
"233.13135.127": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip",
"233.13763.11": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip",
"233.14015.106": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip",
"233.14015.113": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip",
"233.14015.117": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip",
"233.14015.137": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip", "233.14015.137": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip",
"233.14015.60": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip", "233.14015.155": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip",
"233.14015.89": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip", "233.14475.31": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip",
"233.14015.92": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip", "233.14475.40": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip",
"233.14015.96": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip" "233.14475.56": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip",
"233.14475.66": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip",
"233.14808.14": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip",
"233.14808.18": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip",
"233.14808.20": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip",
"233.14808.21": "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip"
}, },
"name": "vscode-keymap" "name": "vscode-keymap"
}, },
@ -318,17 +318,17 @@
"webstorm" "webstorm"
], ],
"builds": { "builds": {
"232.10072.781": "https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip", "233.13135.979": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip",
"233.13135.127": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip",
"233.13763.11": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip",
"233.14015.106": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip",
"233.14015.113": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip",
"233.14015.117": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip",
"233.14015.137": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip", "233.14015.137": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip",
"233.14015.60": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip", "233.14015.155": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip",
"233.14015.89": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip", "233.14475.31": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip",
"233.14015.92": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip", "233.14475.40": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip",
"233.14015.96": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip" "233.14475.56": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip",
"233.14475.66": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip",
"233.14808.14": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip",
"233.14808.18": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip",
"233.14808.20": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip",
"233.14808.21": "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip"
}, },
"name": "eclipse-keymap" "name": "eclipse-keymap"
}, },
@ -349,17 +349,17 @@
"webstorm" "webstorm"
], ],
"builds": { "builds": {
"232.10072.781": "https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip", "233.13135.979": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip",
"233.13135.127": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip",
"233.13763.11": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip",
"233.14015.106": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip",
"233.14015.113": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip",
"233.14015.117": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip",
"233.14015.137": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip", "233.14015.137": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip",
"233.14015.60": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip", "233.14015.155": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip",
"233.14015.89": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip", "233.14475.31": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip",
"233.14015.92": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip", "233.14475.40": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip",
"233.14015.96": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip" "233.14475.56": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip",
"233.14475.66": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip",
"233.14808.14": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip",
"233.14808.18": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip",
"233.14808.20": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip",
"233.14808.21": "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip"
}, },
"name": "visual-studio-keymap" "name": "visual-studio-keymap"
}, },
@ -380,17 +380,17 @@
"webstorm" "webstorm"
], ],
"builds": { "builds": {
"232.10072.781": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "233.13135.979": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"233.13135.127": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"233.13763.11": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"233.14015.106": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"233.14015.113": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"233.14015.117": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"233.14015.137": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "233.14015.137": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"233.14015.60": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "233.14015.155": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"233.14015.89": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "233.14475.31": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"233.14015.92": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar", "233.14475.40": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"233.14015.96": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar" "233.14475.56": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"233.14475.66": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"233.14808.14": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"233.14808.18": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"233.14808.20": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
"233.14808.21": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar"
}, },
"name": "darcula-pitch-black" "name": "darcula-pitch-black"
}, },
@ -411,17 +411,17 @@
"webstorm" "webstorm"
], ],
"builds": { "builds": {
"232.10072.781": "https://plugins.jetbrains.com/files/17718/474473/github-copilot-intellij-1.4.13.4415.zip", "233.13135.979": "https://plugins.jetbrains.com/files/17718/499821/github-copilot-intellij-1.5.0.5148.zip",
"233.13135.127": "https://plugins.jetbrains.com/files/17718/474473/github-copilot-intellij-1.4.13.4415.zip", "233.14015.137": "https://plugins.jetbrains.com/files/17718/499821/github-copilot-intellij-1.5.0.5148.zip",
"233.13763.11": "https://plugins.jetbrains.com/files/17718/474473/github-copilot-intellij-1.4.13.4415.zip", "233.14015.155": "https://plugins.jetbrains.com/files/17718/499821/github-copilot-intellij-1.5.0.5148.zip",
"233.14015.106": "https://plugins.jetbrains.com/files/17718/474473/github-copilot-intellij-1.4.13.4415.zip", "233.14475.31": "https://plugins.jetbrains.com/files/17718/499821/github-copilot-intellij-1.5.0.5148.zip",
"233.14015.113": "https://plugins.jetbrains.com/files/17718/474473/github-copilot-intellij-1.4.13.4415.zip", "233.14475.40": "https://plugins.jetbrains.com/files/17718/499821/github-copilot-intellij-1.5.0.5148.zip",
"233.14015.117": "https://plugins.jetbrains.com/files/17718/474473/github-copilot-intellij-1.4.13.4415.zip", "233.14475.56": "https://plugins.jetbrains.com/files/17718/499821/github-copilot-intellij-1.5.0.5148.zip",
"233.14015.137": "https://plugins.jetbrains.com/files/17718/474473/github-copilot-intellij-1.4.13.4415.zip", "233.14475.66": "https://plugins.jetbrains.com/files/17718/499821/github-copilot-intellij-1.5.0.5148.zip",
"233.14015.60": "https://plugins.jetbrains.com/files/17718/474473/github-copilot-intellij-1.4.13.4415.zip", "233.14808.14": "https://plugins.jetbrains.com/files/17718/499821/github-copilot-intellij-1.5.0.5148.zip",
"233.14015.89": "https://plugins.jetbrains.com/files/17718/474473/github-copilot-intellij-1.4.13.4415.zip", "233.14808.18": "https://plugins.jetbrains.com/files/17718/499821/github-copilot-intellij-1.5.0.5148.zip",
"233.14015.92": "https://plugins.jetbrains.com/files/17718/474473/github-copilot-intellij-1.4.13.4415.zip", "233.14808.20": "https://plugins.jetbrains.com/files/17718/499821/github-copilot-intellij-1.5.0.5148.zip",
"233.14015.96": "https://plugins.jetbrains.com/files/17718/474473/github-copilot-intellij-1.4.13.4415.zip" "233.14808.21": "https://plugins.jetbrains.com/files/17718/499821/github-copilot-intellij-1.5.0.5148.zip"
}, },
"name": "github-copilot" "name": "github-copilot"
}, },
@ -442,17 +442,17 @@
"webstorm" "webstorm"
], ],
"builds": { "builds": {
"232.10072.781": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "233.13135.979": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"233.13135.127": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"233.13763.11": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"233.14015.106": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"233.14015.113": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"233.14015.117": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"233.14015.137": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "233.14015.137": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"233.14015.60": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "233.14015.155": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"233.14015.89": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "233.14475.31": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"233.14015.92": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip", "233.14475.40": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"233.14015.96": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip" "233.14475.56": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"233.14475.66": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"233.14808.14": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"233.14808.18": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"233.14808.20": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
"233.14808.21": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip"
}, },
"name": "netbeans-6-5-keymap" "name": "netbeans-6-5-keymap"
}, },
@ -463,43 +463,34 @@
"rust-rover" "rust-rover"
], ],
"builds": { "builds": {
"233.13135.127": "https://plugins.jetbrains.com/files/22407/473386/intellij-rust-233.23135.127.zip", "233.14015.155": "https://plugins.jetbrains.com/files/22407/498174/intellij-rust-233.24015.155.zip",
"233.14015.106": "https://plugins.jetbrains.com/files/22407/473386/intellij-rust-233.23135.127.zip", "233.14475.31": "https://plugins.jetbrains.com/files/22407/498174/intellij-rust-233.24015.155.zip",
"233.14015.92": "https://plugins.jetbrains.com/files/22407/473386/intellij-rust-233.23135.127.zip" "233.14808.21": "https://plugins.jetbrains.com/files/22407/498174/intellij-rust-233.24015.155.zip"
}, },
"name": "rust" "name": "rust"
} }
}, },
"files": { "files": {
"https://plugins.jetbrains.com/files/10037/432491/CSVEditor-3.2.3-232.zip": "sha256-H/LRD/5Q9qtYCq4CSonqQcJ4IcdefI/vg2Jlmc0vaJY=", "https://plugins.jetbrains.com/files/10037/493012/CSVEditor-3.3.0-233.zip": "sha256-C3l3Z9a7maCrMjc2Fk/wf3AoExRbvN+fn2mAtXigt0A=",
"https://plugins.jetbrains.com/files/10037/432492/CSVEditor-3.2.3-233.zip": "sha256-qbQ2ArW1NcER+LbiVqpB+Sdmi5s78u8jfNmEb+2Nmrg=",
"https://plugins.jetbrains.com/files/12062/364117/keymap-vscode-232.8660.88.zip": "sha256-q5i1eAANK+6uBYrtioKLzvJf5ALUB0K4d31Ut0vT/lE=",
"https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip": "sha256-9keDJ73bSHkzAEq8nT96I5sp05BgMZ08/4BzarOjO5g=", "https://plugins.jetbrains.com/files/12062/445740/keymap-vscode-233.11799.188.zip": "sha256-9keDJ73bSHkzAEq8nT96I5sp05BgMZ08/4BzarOjO5g=",
"https://plugins.jetbrains.com/files/12559/364124/keymap-eclipse-232.8660.88.zip": "sha256-eRCsivZbDNrc+kesa9jVsOoMFFz+WpYfSMXxPCCjWjw=",
"https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip": "sha256-IsmoWuUroAp1LLuphp4F1dun4tQOOitZxoG+Nxs5pYk=", "https://plugins.jetbrains.com/files/12559/445772/keymap-eclipse-233.11799.165.zip": "sha256-IsmoWuUroAp1LLuphp4F1dun4tQOOitZxoG+Nxs5pYk=",
"https://plugins.jetbrains.com/files/13017/364038/keymap-visualStudio-232.8660.88.zip": "sha256-5S8u7w14fLkaTcjACfUSun9pMNtPk20/8+Dr5Sp9sDE=",
"https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip": "sha256-Nb2tSxL+mAY1qJ3waipgV8ep+0R/BaYnzz7zfwtLHmk=", "https://plugins.jetbrains.com/files/13017/445774/keymap-visualStudio-233.11799.165.zip": "sha256-Nb2tSxL+mAY1qJ3waipgV8ep+0R/BaYnzz7zfwtLHmk=",
"https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=", "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=",
"https://plugins.jetbrains.com/files/164/442850/IdeaVim-2.7.5-signed.zip": "sha256-MiF8MVWBEQqupoYyI+QOyXhSvJcoSgptePENByURphI=", "https://plugins.jetbrains.com/files/164/491097/IdeaVim-2.9.1-signed.zip": "sha256-cUlxDF2aYw6od+dwLC3Gtv9tOzzMKo4NGZECBodIQPA=",
"https://plugins.jetbrains.com/files/164/479004/IdeaVim-2.8.2-signed.zip": "sha256-TqcOkgq2tM01VBV4K7daHsIGg4L2TdKqabqJwuJql2Q=", "https://plugins.jetbrains.com/files/17718/499821/github-copilot-intellij-1.5.0.5148.zip": "sha256-/JuPSqFG6VyaDj2IQAYK3Lz7/FQWppfxxXUGuGQggrY=",
"https://plugins.jetbrains.com/files/17718/474473/github-copilot-intellij-1.4.13.4415.zip": "sha256-JpFzBZkv5tXH/TIvXa92VLDy4FDCRt45x6kzmOzzFsA=",
"https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=", "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=",
"https://plugins.jetbrains.com/files/22407/473386/intellij-rust-233.23135.127.zip": "sha256-w0wfdzjekav1uAab2NaZtmTOWDNFz8IxD6Jx0jT4egQ=", "https://plugins.jetbrains.com/files/22407/498174/intellij-rust-233.24015.155.zip": "sha256-oFg2xlR3gB1DpmhqHlugSjnrBDgAHlwvroqwAHiUAzI=",
"https://plugins.jetbrains.com/files/631/474316/python-233.14015.106.zip": "sha256-cCTapGg6tjT8usIoqshrhw7Ubg9cYrRGIZiLsiGtT0g=", "https://plugins.jetbrains.com/files/631/502576/python-233.14808.21.zip": "sha256-1YN+brLdFOgcSQwLzafrjbIZ4NWBllaKulLCJ6MfdGI=",
"https://plugins.jetbrains.com/files/6954/459286/kotlin-plugin-232-1.9.22-release-704-IJ10072.27.zip": "sha256-3I/wmEkK+iL0VpwoqRlotI+G8G+sqcGN1MCcab+HX5E=", "https://plugins.jetbrains.com/files/6981/487357/ini-233.14475.38.zip": "sha256-++4e6qSYfqoP3/M69xyNaNmkhyeX3h8dK9cJabeB5cY=",
"https://plugins.jetbrains.com/files/6981/464477/ini-233.13135.116.zip": "sha256-YoFaVOgW0DuyCp/pvcU5ePdnZokrOJZ/SwY6lxnYUOA=", "https://plugins.jetbrains.com/files/6981/502555/ini-233.14808.20.zip": "sha256-8uDtfKkWfYr2qTD4Etb/zne1IXiiVLKQGJHKIVtp5cI=",
"https://plugins.jetbrains.com/files/6981/468089/ini-233.13763.5.zip": "sha256-sKeMk4lMeBlu7F/mf3GFRc9RZSVrAlCdRLaQARHfxow=", "https://plugins.jetbrains.com/files/7219/497847/Symfony_Plugin-2023.1.265.zip": "sha256-lAAu2NamhKjGcVTu5cBlwSX8UP8bkKf9S++CW6xzvkk=",
"https://plugins.jetbrains.com/files/6981/474956/ini-233.14015.113.zip": "sha256-tJoqLmhQBsAC/k0H3rNO0/3/Np539KXiZfTMTfvUkH4=",
"https://plugins.jetbrains.com/files/7219/467592/Symfony_Plugin-2022.1.263.zip": "sha256-KFnMKzybqbLbPVRzRtrUBaNsrel46V2YRmQFc1EecLY=",
"https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip": "sha256-hT5K4w4lhvNwDzDMDSvsIDGj9lyaRqglfOhlbNdqpWs=", "https://plugins.jetbrains.com/files/7320/346181/PHP_Annotations-9.4.0.zip": "sha256-hT5K4w4lhvNwDzDMDSvsIDGj9lyaRqglfOhlbNdqpWs=",
"https://plugins.jetbrains.com/files/7322/456914/python-ce-233.13135.103.zip": "sha256-Yqb3FPG5M5+hNHX3OSEStBekjTjMlf4IV6Yr6+lfoRw=",
"https://plugins.jetbrains.com/files/7322/474341/python-ce-233.14015.106.zip": "sha256-yd70cSA/Icn5YlH4Q79cIWGFJ6huYUBDKk6vCIYa3DU=", "https://plugins.jetbrains.com/files/7322/474341/python-ce-233.14015.106.zip": "sha256-yd70cSA/Icn5YlH4Q79cIWGFJ6huYUBDKk6vCIYa3DU=",
"https://plugins.jetbrains.com/files/8182/372556/intellij-rust-0.4.200.5420-232-beta.zip": "sha256-ZlSfPvhPixEz5JxU9qyG0nL3jiSjr4gKaf/xYcQI1vQ=", "https://plugins.jetbrains.com/files/7322/484110/python-ce-233.14475.9.zip": "sha256-YMB/ewCKE1F/JXI8iau9pKkv9D5D9a8OiTVukkzTocA=",
"https://plugins.jetbrains.com/files/8182/395553/intellij-rust-0.4.201.5424-232.zip": "sha256-pVwBEyUCx/DJET9uIm8vxFeChE8FskWyfLjDpfg2mAE=", "https://plugins.jetbrains.com/files/7322/502153/python-ce-233.14808.12.zip": "sha256-PUBR9krJ26QrL2jTus0b+uhzkEkT+lGnBKy1f4i/U+w=",
"https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip": "sha256-+Lc/avYBLpyIV63DlbhAJtieHDv4HdggqdGFDw9iqN0=", "https://plugins.jetbrains.com/files/8182/466854/intellij-rust-233.15445.zip": "sha256-+Lc/avYBLpyIV63DlbhAJtieHDv4HdggqdGFDw9iqN0=",
"https://plugins.jetbrains.com/files/8554/454574/featuresTrainer-233.13135.67.zip": "sha256-XgtOrfULS7TJ6yfWOwNX/EL6cEirvVyzMtPzlPJEkXM=",
"https://plugins.jetbrains.com/files/8554/469535/featuresTrainer-233.14015.29.zip": "sha256-Hj/CsaQb1U3FN1x2+00Rq2NjC6AWrfuTJL1NiEssfJ4=", "https://plugins.jetbrains.com/files/8554/469535/featuresTrainer-233.14015.29.zip": "sha256-Hj/CsaQb1U3FN1x2+00Rq2NjC6AWrfuTJL1NiEssfJ4=",
"https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip": "sha256-Dwitpu5yLPWx+IUilpN5iqnN8FkKgaxUNjroBEx5lkM=", "https://plugins.jetbrains.com/files/8607/422943/NixIDEA-0.4.0.11.zip": "sha256-Dwitpu5yLPWx+IUilpN5iqnN8FkKgaxUNjroBEx5lkM=",
"https://plugins.jetbrains.com/files/9568/474312/go-plugin-233.14015.106.zip": "sha256-i281TuFtacnu+horAhcHYZy0zV2nRJzSorFBPpC7usc=" "https://plugins.jetbrains.com/files/9568/502583/go-plugin-233.14808.21.zip": "sha256-QPZRPCCSta/q9hj0fVlmF26xebAKyUhh/dc27FgJHco="
} }
} }

View File

@ -1400,12 +1400,12 @@ let
# semver scheme, contrary to preview versions which are listed on # semver scheme, contrary to preview versions which are listed on
# the VSCode Marketplace and use a calver scheme. We should avoid # the VSCode Marketplace and use a calver scheme. We should avoid
# using preview versions, because they expire after two weeks. # using preview versions, because they expire after two weeks.
version = "14.1.1"; version = "14.9.0";
sha256 = "sha256-eSN48IudpHYzT4u+S4b2I2pyEPyOwBCSL49awT/mzEE="; sha256 = "sha256-Z6KeIUw1SLZ4tUgs7sU9IJO/6diozPxQuTbXr6DayHA=";
}; };
meta = { meta = {
changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog"; changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog";
description = "GitLens supercharges the Git capabilities built into Visual Studio Code."; description = "A Visual Studio Code extension that improves its built-in Git capabilities";
longDescription = '' longDescription = ''
Supercharge the Git capabilities built into Visual Studio Code Visualize code authorship at a glance via Git Supercharge the Git capabilities built into Visual Studio Code Visualize code authorship at a glance via Git
blame annotations and code lens, seamlessly navigate and explore Git repositories, gain valuable insights via blame annotations and code lens, seamlessly navigate and explore Git repositories, gain valuable insights via

View File

@ -55,10 +55,10 @@
"src": { "src": {
"owner": "libretro", "owner": "libretro",
"repo": "beetle-pce-libretro", "repo": "beetle-pce-libretro",
"rev": "729a29761ae491941369c66e5f4d3521f3d335b4", "rev": "20b86372b5f490394099ee0ad06e0eb3a4fd5c2e",
"hash": "sha256-Vv/e5qa/4JjOiUC/PvuJai2VjmAQ3Xz069l1+gP7aOw=" "hash": "sha256-jYV2eiBSLj9H2RIau8NwYLGV2SY7GqygEYTJ3YVoMNc="
}, },
"version": "unstable-2024-03-15" "version": "unstable-2024-03-22"
}, },
"beetle-pce-fast": { "beetle-pce-fast": {
"fetcher": "fetchFromGitHub", "fetcher": "fetchFromGitHub",
@ -115,10 +115,10 @@
"src": { "src": {
"owner": "libretro", "owner": "libretro",
"repo": "beetle-supergrafx-libretro", "repo": "beetle-supergrafx-libretro",
"rev": "239d25f4c2bbb6e66d3e48502907d3d611119a22", "rev": "e41f864c0abb36aef20f8e37cd9d9a92c00a9221",
"hash": "sha256-8SP/SOJR/5tDkpysYTAuDPeQJCaAVgXE9CieSj1H4ZQ=" "hash": "sha256-LkkW5mQmwv89ZECssVh43ezwe4xMagUOiSz82OupISQ="
}, },
"version": "unstable-2024-03-08" "version": "unstable-2024-03-22"
}, },
"beetle-vb": { "beetle-vb": {
"fetcher": "fetchFromGitHub", "fetcher": "fetchFromGitHub",
@ -287,10 +287,10 @@
"src": { "src": {
"owner": "libretro", "owner": "libretro",
"repo": "fbneo", "repo": "fbneo",
"rev": "30150f7f5193be76d15653ba378d68b55d684e4f", "rev": "b6c6d883df5e9e9a9a5d4b9f09e796702b08d177",
"hash": "sha256-ZC4FyiKU+BR8Oqjv28/AE1jrCqC/mbTa/+UKvwK+SDs=" "hash": "sha256-dLDtcjp68caRwc3wLj80Oj7HA/SlW7/eswbY1n3aRAc="
}, },
"version": "unstable-2024-03-17" "version": "unstable-2024-03-21"
}, },
"fceumm": { "fceumm": {
"fetcher": "fetchFromGitHub", "fetcher": "fetchFromGitHub",
@ -307,11 +307,11 @@
"src": { "src": {
"owner": "flyinghead", "owner": "flyinghead",
"repo": "flycast", "repo": "flycast",
"rev": "c7ee42f0ba16623cab44678a586c248d068933f7", "rev": "40cdef6c1c9bd73bf3a55d412e30c25bbcf2b59c",
"hash": "sha256-TPsG82LACDys2eQk2lZj4DBB5HUSE6mWwSrpnfdv8gQ=", "hash": "sha256-+3PqeLT6i2HesVaA5b13bavNqH0mqeFIkHfhusdzWYU=",
"fetchSubmodules": true "fetchSubmodules": true
}, },
"version": "unstable-2024-03-17" "version": "unstable-2024-03-19"
}, },
"fmsx": { "fmsx": {
"fetcher": "fetchFromGitHub", "fetcher": "fetchFromGitHub",
@ -438,10 +438,10 @@
"src": { "src": {
"owner": "libretro", "owner": "libretro",
"repo": "mame2003-plus-libretro", "repo": "mame2003-plus-libretro",
"rev": "f8b0565fd3278f2efbc3e68fc929a912645e211b", "rev": "8e60ed0217ff6206768d7bdc6313e86c4c852405",
"hash": "sha256-jOQxPUTbKQH0PKJSOItEpSHaNPzMlYOJ2CUgzSLHti4=" "hash": "sha256-zq143CSDMSBQ/e7kntz63cTaKk552IKfCoRGmt5jYik="
}, },
"version": "unstable-2024-03-10" "version": "unstable-2024-03-21"
}, },
"mame2010": { "mame2010": {
"fetcher": "fetchFromGitHub", "fetcher": "fetchFromGitHub",
@ -630,10 +630,10 @@
"src": { "src": {
"owner": "libretro", "owner": "libretro",
"repo": "pcsx_rearmed", "repo": "pcsx_rearmed",
"rev": "1546496fa818dc51e763c37f4f2e2456dafa4e13", "rev": "2b2ac30d6905b3434d822c223b36957aef96a857",
"hash": "sha256-9zAor3HxefRlRLq0ab447JUG1JsBZ4OdAbvzw3XckqE=" "hash": "sha256-jBs3ccKXGX0wumQkGeoNpbsRfWFx5lTufUE0NhEfCtk="
}, },
"version": "unstable-2024-03-10" "version": "unstable-2024-03-21"
}, },
"picodrive": { "picodrive": {
"fetcher": "fetchFromGitHub", "fetcher": "fetchFromGitHub",
@ -651,22 +651,22 @@
"src": { "src": {
"owner": "jpd002", "owner": "jpd002",
"repo": "Play-", "repo": "Play-",
"rev": "65d892247c28569cc971a84d743e7bb2ec7a3dd6", "rev": "6e9fa384d6e94f552ba56c3233b38770c41b46af",
"hash": "sha256-wRX/xGnIjdTO2W9k09JWb3gMx8rFv4+9IaqCQ3qroyA=", "hash": "sha256-KplGpF0d821ms/UA0GVtDVgdFQR6Xbl844GVPUId77Q=",
"fetchSubmodules": true "fetchSubmodules": true
}, },
"version": "unstable-2024-03-15" "version": "unstable-2024-03-21"
}, },
"ppsspp": { "ppsspp": {
"fetcher": "fetchFromGitHub", "fetcher": "fetchFromGitHub",
"src": { "src": {
"owner": "hrydgard", "owner": "hrydgard",
"repo": "ppsspp", "repo": "ppsspp",
"rev": "8e93f9ad71c645cb77047fe1bd75bfb925f83580", "rev": "cd85b4d5e8410dd9b5a9ee5c0e507abd0dc3ff29",
"hash": "sha256-xwSOPea+85h+FhtBOPfAaiQ/2AiU6PLPwm0/PCYUTGU=", "hash": "sha256-a/Le2xFoLmRU8Q2WIegipt/kU49px20W7P6/zqQsspQ=",
"fetchSubmodules": true "fetchSubmodules": true
}, },
"version": "unstable-2024-03-17" "version": "unstable-2024-03-21"
}, },
"prboom": { "prboom": {
"fetcher": "fetchFromGitHub", "fetcher": "fetchFromGitHub",

View File

@ -3,22 +3,29 @@
}: }:
let let
pname = "josm"; pname = "josm";
version = "18969"; version = "19017";
srcs = { srcs = {
jar = fetchurl { jar = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
hash = "sha256-a8muRwE4+9WdYVz7lYE9dRnqVIGQxL8cFmIdBr2R65U="; hash = "sha256-+PSsvauVe+e+qB7sz9AFmC/dZhWHFHe0zWYPEhgvRIQ=";
}; };
macosx = fetchurl { macosx = fetchurl {
url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip"; url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip";
hash = "sha256-npXY7WJM1+9ygeAw102UtimnI/yXqs5vgPnatm4AIrI="; hash = "sha256-QYvAC+W7gHC5unwfcbQ0sz5U1VkMwIIUkDWQK9vDe2A=";
}; };
pkg = fetchsvn { pkg = fetchsvn {
url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";
rev = version; rev = version;
sha256 = "sha256-RFZGRTDdWP/goH/Ev16nhq1SjxYkfFr3djwSrotK7Fo="; sha256 = "sha256-Pb4EAyvERz6kP3EmkgmUy/58KQHhBJmZJvpAj72GCIk=";
}; };
}; };
# Needed as of version 19017.
baseJavaOpts = toString [
"--add-exports=java.base/sun.security.action=ALL-UNNAMED"
"--add-exports=java.desktop/com.sun.imageio.plugins.jpeg=ALL-UNNAMED"
"--add-exports=java.desktop/com.sun.imageio.spi=ALL-UNNAMED"
];
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
inherit pname version; inherit pname version;
@ -38,7 +45,7 @@ stdenv.mkDerivation rec {
# Add libXxf86vm to path because it is needed by at least Kendzi3D plugin # Add libXxf86vm to path because it is needed by at least Kendzi3D plugin
makeWrapper ${jre}/bin/java $out/bin/josm \ makeWrapper ${jre}/bin/java $out/bin/josm \
--add-flags "${extraJavaOpts} -jar $out/share/josm/josm.jar" \ --add-flags "${baseJavaOpts} ${extraJavaOpts} -jar $out/share/josm/josm.jar" \
--prefix LD_LIBRARY_PATH ":" '${libXxf86vm}/lib' --prefix LD_LIBRARY_PATH ":" '${libXxf86vm}/lib'
''; '';

View File

@ -7,6 +7,7 @@
, pkg-config , pkg-config
, libayatana-appindicator , libayatana-appindicator
, undmg , undmg
, makeBinaryWrapper
}: }:
let let
@ -72,13 +73,14 @@ let
hash = "sha256-L7V48QoOA0cjx45n+9Xav/zzCzCsZB3TBip0WGusMXg="; hash = "sha256-L7V48QoOA0cjx45n+9Xav/zzCzCsZB3TBip0WGusMXg=";
}; };
nativeBuildInputs = [ undmg ]; nativeBuildInputs = [ undmg makeBinaryWrapper ];
sourceRoot = "."; sourceRoot = ".";
installPhase = '' installPhase = ''
mkdir -p $out/Applications mkdir -p $out/Applications
cp -r *.app $out/Applications cp -r *.app $out/Applications
makeBinaryWrapper $out/Applications/LocalSend.app/Contents/MacOS/LocalSend $out/bin/localsend
''; '';
meta = metaCommon // { meta = metaCommon // {

View File

@ -21,6 +21,10 @@
, libpthreadstubs , libpthreadstubs
, libXdmcp , libXdmcp
, unixODBC , unixODBC
, libgit2
, libsecret
, libgcrypt
, libgpg-error
, util-linux , util-linux
, libselinux , libselinux
@ -92,12 +96,11 @@ stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DKICAD_USE_EGL=ON" "-DKICAD_USE_EGL=ON"
"-DOCC_INCLUDE_DIR=${opencascade-occt}/include/opencascade" "-DOCC_INCLUDE_DIR=${opencascade-occt}/include/opencascade"
# https://gitlab.com/kicad/code/kicad/-/issues/17133
"-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;qa_spice'"
] ]
++ optionals (stable) [ ++ optional (stdenv.hostPlatform.system == "aarch64-linux")
# https://gitlab.com/kicad/code/kicad/-/issues/12491 "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;'qa_spice|qa_cli'"
# should be resolved in the next major? release
"-DCMAKE_CTEST_ARGUMENTS='--exclude-regex;qa_eeschema'"
]
++ optional (stable && !withNgspice) "-DKICAD_SPICE=OFF" ++ optional (stable && !withNgspice) "-DKICAD_SPICE=OFF"
++ optionals (!withScripting) [ ++ optionals (!withScripting) [
"-DKICAD_SCRIPTING_WXPYTHON=OFF" "-DKICAD_SCRIPTING_WXPYTHON=OFF"
@ -126,6 +129,10 @@ stdenv.mkDerivation rec {
doxygen doxygen
graphviz graphviz
pkg-config pkg-config
libgit2
libsecret
libgcrypt
libgpg-error
] ]
# wanted by configuration on linux, doesn't seem to affect performance # wanted by configuration on linux, doesn't seem to affect performance
# no effect on closure size # no effect on closure size
@ -180,13 +187,14 @@ stdenv.mkDerivation rec {
doInstallCheck = !(debug); doInstallCheck = !(debug);
installCheckTarget = "test"; installCheckTarget = "test";
pythonForTests = python.withPackages(ps: with ps; [ nativeInstallCheckInputs = [
numpy (python.withPackages(ps: with ps; [
pytest numpy
cairosvg pytest
pytest-image-diff cairosvg
]); pytest-image-diff
nativeInstallCheckInputs = optional (!stable) pythonForTests; ]))
];
dontStrip = debug; dontStrip = debug;

View File

@ -205,9 +205,9 @@ stdenv.mkDerivation rec {
"--prefix GIO_EXTRA_MODULES : ${dconf}/lib/gio/modules" "--prefix GIO_EXTRA_MODULES : ${dconf}/lib/gio/modules"
# required to open a bug report link in firefox-wayland # required to open a bug report link in firefox-wayland
"--set-default MOZ_DBUS_REMOTE 1" "--set-default MOZ_DBUS_REMOTE 1"
"--set-default KICAD7_FOOTPRINT_DIR ${footprints}/share/kicad/footprints" "--set-default KICAD8_FOOTPRINT_DIR ${footprints}/share/kicad/footprints"
"--set-default KICAD7_SYMBOL_DIR ${symbols}/share/kicad/symbols" "--set-default KICAD8_SYMBOL_DIR ${symbols}/share/kicad/symbols"
"--set-default KICAD7_TEMPLATE_DIR ${template_dir}" "--set-default KICAD8_TEMPLATE_DIR ${template_dir}"
] ]
++ optionals (addons != [ ]) ( ++ optionals (addons != [ ]) (
let stockDataPath = symlinkJoin { let stockDataPath = symlinkJoin {
@ -218,11 +218,11 @@ stdenv.mkDerivation rec {
]; ];
}; };
in in
[ "--set-default NIX_KICAD7_STOCK_DATA_PATH ${stockDataPath}" ] [ "--set-default NIX_KICAD8_STOCK_DATA_PATH ${stockDataPath}" ]
) )
++ optionals (with3d) ++ optionals (with3d)
[ [
"--set-default KICAD7_3DMODEL_DIR ${packages3d}/share/kicad/3dmodels" "--set-default KICAD8_3DMODEL_DIR ${packages3d}/share/kicad/3dmodels"
] ]
++ optionals (withNgspice) [ "--prefix LD_LIBRARY_PATH : ${libngspice}/lib" ] ++ optionals (withNgspice) [ "--prefix LD_LIBRARY_PATH : ${libngspice}/lib" ]

View File

@ -6,7 +6,7 @@ index a74cdd9..790cc58 100644
{ {
wxString path; wxString path;
+ if( wxGetEnv( wxT( "NIX_KICAD7_STOCK_DATA_PATH" ), &path ) ) { + if( wxGetEnv( wxT( "NIX_KICAD8_STOCK_DATA_PATH" ), &path ) ) {
+ return path; + return path;
+ } + }
+ +

View File

@ -3,67 +3,67 @@
{ {
"kicad" = { "kicad" = {
kicadVersion = { kicadVersion = {
version = "7.0.10"; version = "8.0.1";
src = { src = {
rev = "7daac78752749fc919e932be6156914aa83c926f"; rev = "20421d65e5a7ede894345d337ab47b469f5ba154";
sha256 = "0z459yi0s02mwdgbr3xxw43gn9yjhvfkjnsxmns5mksgzsr5nmhh"; sha256 = "096kvmm96ccxir1rspgzzjkp6y2j80l3w2vphg9iv3drxmjp7qjv";
}; };
}; };
libVersion = { libVersion = {
version = "7.0.10"; version = "8.0.1";
libSources = { libSources = {
symbols.rev = "eedf6c9ddac2816023e817d4dc91032f9d7390b9"; symbols.rev = "d6aff3948edfca2bacf36900ff080f6b3f65fe4c";
symbols.sha256 = "0nlgmxf9z1vf4g350dfkxql1dawgmw275wqxkgszsfxmhdfpmi9v"; symbols.sha256 = "00xnvikmqd1zkg9p1f89kvryvkybl5f20baij6babqyc29nbzkwy";
templates.rev = "9ce98cc45f3778e05c404edebf0f98de5c247ffe"; templates.rev = "0a6c4f798a68a5c639d54b4d3093460ab9267816";
templates.sha256 = "0mykfwwik7472i4r0isc5szj3dnmvd0538p0vlmzh4rcgj3pj3vm"; templates.sha256 = "0m9bggz3cm27kqpjjwxy19mqzk0c69bywcjkqcni7kafr21c6k4z";
footprints.rev = "7061fc9847ecc1b838e60dc6826db534028494f6"; footprints.rev = "226b4f3d5c10a4126d88b895188bdab629fe60b0";
footprints.sha256 = "1az6fzh1lma71mj12bc4bblnmzjayrxhkb8w9rjvlhvvgv33cdmy"; footprints.sha256 = "1bb3mb2a7vkridgmqqm9ib3hv2m4zx1i14mglb11sribypy0ma5p";
packages3d.rev = "d7345b34daaa23acf0d4506ed937fb424b5b18cd"; packages3d.rev = "49c1cd4017499b8a7f6dedbe7ede834d1713eb28";
packages3d.sha256 = "0xzyi4mgyifwc6dppdzh6jq294mkj0a71cwkqw2ymz1kfbksw626"; packages3d.sha256 = "0b5jwr5bbd0kzb75nj3028knjrv0872dk54sbsnxaz669q8zaxap";
}; };
}; };
}; };
"kicad-testing" = { "kicad-testing" = {
kicadVersion = { kicadVersion = {
version = "7.0-2024-01-27"; version = "8.0-2024-02-23";
src = { src = {
rev = "13fcb571f7e5bf4bf142d151651fc577aca32053"; rev = "14d71c8ca6b48d2eb956bb069acf05a37b1b2652";
sha256 = "0wvk3wx5lm2jvyip6b96ja464hdzp9klb7b7ng5i3mdldabh0jba"; sha256 = "0xqd0xbpnvsvba75526nwgzr8l2cfxy99sjmg13sjxfx7rq16kqi";
}; };
}; };
libVersion = { libVersion = {
version = "7.0-2024-01-27"; version = "8.0-2024-02-23";
libSources = { libSources = {
symbols.rev = "eedf6c9ddac2816023e817d4dc91032f9d7390b9"; symbols.rev = "e228d4e8b295364e90e36c57f4023d8285ba88cd";
symbols.sha256 = "0nlgmxf9z1vf4g350dfkxql1dawgmw275wqxkgszsfxmhdfpmi9v"; symbols.sha256 = "049h2a7yn6ks8sybppixa872dbvyd0rwf9r6nixvdg6d13fl6rwf";
templates.rev = "9ce98cc45f3778e05c404edebf0f98de5c247ffe"; templates.rev = "2e00c233b67e35323f90d04c190bf70237a252f2";
templates.sha256 = "0mykfwwik7472i4r0isc5szj3dnmvd0538p0vlmzh4rcgj3pj3vm"; templates.sha256 = "0m9bggz3cm27kqpjjwxy19mqzk0c69bywcjkqcni7kafr21c6k4z";
footprints.rev = "7061fc9847ecc1b838e60dc6826db534028494f6"; footprints.rev = "6e5329a6d4aaa81290e23af3eba88f505c2f61b0";
footprints.sha256 = "1az6fzh1lma71mj12bc4bblnmzjayrxhkb8w9rjvlhvvgv33cdmy"; footprints.sha256 = "0ypjlbmzmcl3pha3q2361va70c988b1drxy8320gm66jkzfc21a1";
packages3d.rev = "d7345b34daaa23acf0d4506ed937fb424b5b18cd"; packages3d.rev = "d1e521228d9f5888836b1a6a35fb05fb925456fa";
packages3d.sha256 = "0xzyi4mgyifwc6dppdzh6jq294mkj0a71cwkqw2ymz1kfbksw626"; packages3d.sha256 = "0lcy1av7ixg1f7arflk50jllpc1749sfvf3h62hkxsz97wkr97xj";
}; };
}; };
}; };
"kicad-unstable" = { "kicad-unstable" = {
kicadVersion = { kicadVersion = {
version = "2023-08-15"; version = "2024-02-23";
src = { src = {
rev = "e0d4cf2d5b023a7e5b70d854452376aa3510acd8"; rev = "b7b64d959f37f00bb0d14b007c3b3908196e1024";
sha256 = "0666j4q3vz24smcjw9m4ib3ca2dqiqgx2amhv7ys4rzqb6v2pvn2"; sha256 = "1gl7mjqpmqq4m55z6crwb77983g00gi2161ichsc7hsfhs4c8grh";
}; };
}; };
libVersion = { libVersion = {
version = "2023-08-15"; version = "2024-02-23";
libSources = { libSources = {
symbols.rev = "06d20a4b9f7e5375329194d141b096dcdcb7518a"; symbols.rev = "8b0c343d8694fe0a968e5c4af69fd161bacf7da1";
symbols.sha256 = "1wr754m4ykidds3i14gqhvyrj3mbkchp2hkfnr0rjsdaqf4zmqdf"; symbols.sha256 = "049h2a7yn6ks8sybppixa872dbvyd0rwf9r6nixvdg6d13fl6rwf";
templates.rev = "867eef383a0f61015cb69677d5c632d78a2ea01a"; templates.rev = "0a6c4f798a68a5c639d54b4d3093460ab9267816";
templates.sha256 = "1qi20mrsfn4fxmr1fyphmil2i9p2nzmwk5rlfchc5aq2194nj3lq"; templates.sha256 = "0m9bggz3cm27kqpjjwxy19mqzk0c69bywcjkqcni7kafr21c6k4z";
footprints.rev = "5d2ac73ae72bfe8b8ee9eeb081a7851b2ca84c24"; footprints.rev = "ded6b053460faae5783c538a38e91e2b4bddcf2e";
footprints.sha256 = "1qg016ysf0ddm3bd5bkjawlrc0z4r3zhmdjkqkwaaaydnpwp23qz"; footprints.sha256 = "035bf37n4vrihaj4zfdncisdx9fly1vya7lhkxhlsbv5blpi4a5y";
packages3d.rev = "f1dae9f95e59216f3b974f585e5b420db853da9e"; packages3d.rev = "984667325076d4e50dab14e755aeacf97f42194c";
packages3d.sha256 = "0ciri6lhnh0w9i00z167snj5acnjndi1rgmyls08p45zj4rma8y2"; packages3d.sha256 = "0lkaxv02h4sxrnm8zr17wl9d07mazlisad78r35gry741i362cdg";
}; };
}; };
}; };

View File

@ -1,5 +1,14 @@
{ lib, stdenv, fetchurl, fetchFromGitHub, qmake, wrapQtAppsHook { lib
, mpv, qtwebengine, qtwebchannel, nodejs , stdenv
, fetchFromGitHub
, fetchurl
, ffmpeg
, mpv
, nodejs
, qmake
, qtwebchannel
, qtwebengine
, wrapQtAppsHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -30,6 +39,8 @@ stdenv.mkDerivation rec {
install -Dm 644 images/stremio_window.png $out/share/pixmaps/smartcode-stremio.png install -Dm 644 images/stremio_window.png $out/share/pixmaps/smartcode-stremio.png
ln -s ${nodejs}/bin/node $out/opt/stremio/node ln -s ${nodejs}/bin/node $out/opt/stremio/node
ln -s $server $out/opt/stremio/server.js ln -s $server $out/opt/stremio/server.js
wrapProgram $out/bin/stremio \
--suffix PATH ":" ${lib.makeBinPath [ ffmpeg ]}
''; '';
meta = with lib; { meta = with lib; {

View File

@ -1,4 +1,15 @@
{ stdenv, lib, openssl, darwin, libgit2, makeWrapper, nix, pkg-config, rustPlatform, cachix, fetchFromGitHub }: { stdenv
, lib
, openssl
, darwin
, libgit2
, makeWrapper
, nix
, pkg-config
, rustPlatform
, cachix
, fetchFromGitHub
}:
let let
devenv_nix = nix.overrideAttrs (old: { devenv_nix = nix.overrideAttrs (old: {
@ -13,6 +24,7 @@ let
doCheck = false; doCheck = false;
doInstallCheck = false; doInstallCheck = false;
}); });
version = "1.0.1"; version = "1.0.1";
in rustPlatform.buildRustPackage { in rustPlatform.buildRustPackage {
pname = "devenv"; pname = "devenv";
@ -38,4 +50,13 @@ in rustPlatform.buildRustPackage {
postInstall = '' postInstall = ''
wrapProgram $out/bin/devenv --set DEVENV_NIX ${devenv_nix} --prefix PATH ":" "$out/bin:${cachix}/bin" wrapProgram $out/bin/devenv --set DEVENV_NIX ${devenv_nix} --prefix PATH ":" "$out/bin:${cachix}/bin"
''; '';
meta = {
changelog = "https://github.com/cachix/devenv/releases/tag/v${version}";
description = "Fast, Declarative, Reproducible, and Composable Developer Environments";
homepage = "https://github.com/cachix/devenv";
license = lib.licenses.asl20;
mainProgram = "devenv";
maintainers = with lib.maintainers; [ domenkozar drupol ];
};
} }

View File

@ -15,13 +15,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "folio"; pname = "folio";
version = "24.07"; version = "24.08";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "toolstack"; owner = "toolstack";
repo = "Folio"; repo = "Folio";
rev = version; rev = version;
hash = "sha256-qYzi9XDwXj/0fUhclCY7WnEisMedoCUKbYlDUvgwimI="; hash = "sha256-IwcLz5b2aEVUE0YS3qZ3238ksucQFpPl3eQGIjQo+pA=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -0,0 +1,311 @@
{ stdenv
, lib
, fetchpatch
, fetchFromGitHub
, ncurses
, protobuf
, grpc
, openssl
# needed for audio-to-text
, ffmpeg
, cmake
, buildGoModule
, makeWrapper
, runCommand
, testers
# apply feature parameter names according to
# https://github.com/NixOS/rfcs/pull/169
, with_tinydream ? false
, with_openblas ? false
, openblas
, pkg-config
, with_cublas ? false
, cudaPackages
, with_clblas ? false
, clblast
, ocl-icd
, opencl-headers
, with_stablediffusion ? false
, opencv
, with_tts ? false
, onnxruntime
, sonic
, spdlog
, fmt
}:
let
go-llama-ggml = fetchFromGitHub {
owner = "go-skynet";
repo = "go-llama.cpp";
rev = "2b57a8ae43e4699d3dc5d1496a1ccd42922993be";
hash = "sha256-D6SEg5pPcswGyKAmF4QTJP6/Y1vjRr7m7REguag+too=";
fetchSubmodules = true;
};
# possible improvement: use Nix package llama-cpp
llama_cpp = fetchFromGitHub {
owner = "ggerganov";
repo = "llama.cpp";
rev = "d01b3c4c32357567f3531d4e6ceffc5d23e87583";
hash = "sha256-7eaQV+XTCXdrJlo7y21q5j/8ecVwuTMJScRTATcF6oM=";
fetchSubmodules = true;
};
llama_cpp' = runCommand "llama_cpp_src" { } ''
cp -r --no-preserve=mode,ownership ${llama_cpp} $out
sed -i $out/CMakeLists.txt \
-e 's;pkg_check_modules(DepBLAS REQUIRED openblas);pkg_check_modules(DepBLAS REQUIRED openblas64);'
'';
gpt4all = fetchFromGitHub {
owner = "nomic-ai";
repo = "gpt4all";
rev = "27a8b020c36b0df8f8b82a252d261cda47cf44b8";
hash = "sha256-djq1eK6ncvhkO3MNDgasDBUY/7WWcmZt/GJsHAulLdI=";
fetchSubmodules = true;
};
go-piper = fetchFromGitHub {
owner = "mudler";
repo = "go-piper";
rev = "9d0100873a7dbb0824dfea40e8cec70a1b110759";
hash = "sha256-Yv9LQkWwGpYdOS0FvtP0vZ0tRyBAx27sdmziBR4U4n8=";
fetchSubmodules = true;
};
go-rwkv = fetchFromGitHub {
owner = "donomii";
repo = "go-rwkv.cpp";
rev = "661e7ae26d442f5cfebd2a0881b44e8c55949ec6";
hash = "sha256-byTNZQSnt7qpBMng3ANJmpISh3GJiz+F15UqfXaz6nQ=";
fetchSubmodules = true;
};
whisper = fetchFromGitHub {
owner = "ggerganov";
repo = "whisper.cpp";
rev = "a56f435fd475afd7edf02bfbf9f8c77f527198c2";
hash = "sha256-ozTnxEuftAQQr5v/kwg5EKHuKF21d9ETIyvXcvr0Qos=";
fetchSubmodules = true;
};
go-bert = fetchFromGitHub {
owner = "go-skynet";
repo = "go-bert.cpp";
rev = "6abe312cded14042f6b7c3cd8edf082713334a4d";
hash = "sha256-lh9cvXc032Eq31kysxFOkRd0zPjsCznRl0tzg9P2ygo=";
fetchSubmodules = true;
};
go-stable-diffusion = stdenv.mkDerivation {
pname = "go_stable_diffusion";
version = "unstable";
src = fetchFromGitHub {
owner = "mudler";
repo = "go-stable-diffusion";
rev = "362df9da29f882dbf09ade61972d16a1f53c3485";
hash = "sha256-A5KvMZOviPsIpPHxM8cacT+qE2x1iFJAbPsRs4sLijY=";
fetchSubmodules = true;
};
buildFlags = [ "libstablediffusion.a" ];
dontUseCmakeConfigure = true;
nativeBuildInputs = [ cmake ];
buildInputs = [ opencv ];
env.NIX_CFLAGS_COMPILE = " -isystem ${opencv}/include/opencv4";
installPhase = ''
install -Dt $out libstablediffusion.a Makefile go.mod *.go stablediffusion.h
'';
};
go-tiny-dream = fetchFromGitHub {
owner = "M0Rf30";
repo = "go-tiny-dream";
rev = "772a9c0d9aaf768290e63cca3c904fe69faf677a";
hash = "sha256-r+wzFIjaI6cxAm/eXN3q8LRZZz+lE5EA4lCTk5+ZnIY=";
fetchSubmodules = true;
};
go-tiny-dream' = runCommand "go_tiny_dream_src" { } ''
cp -r --no-preserve=mode,ownership ${go-tiny-dream} $out
sed -i $out/Makefile \
-e 's;lib/libncnn;lib64/libncnn;g'
'';
GO_TAGS = lib.optional with_tinydream "tinydream"
++ lib.optional with_tts "tts"
++ lib.optional with_stablediffusion "stablediffusion";
buildEnv =
if with_cublas then
# It's necessary to consistently use backendStdenv when building with CUDA support,
# otherwise we get libstdc++ errors downstream.
buildGoModule.override { stdenv = cudaPackages.backendStdenv; }
else
buildGoModule;
self = buildEnv rec {
pname = "local-ai";
version = "2.10.1";
src = fetchFromGitHub {
owner = "go-skynet";
repo = "LocalAI";
rev = "v${version}";
hash = "sha256-135s1Gw8mfOIx4kXlw2pYrD3ewwajUtnz3sPY/CtoLw=";
};
vendorHash = "sha256-UCeG0TKS+VBW8D87VmxTHS2tCAf0ADEYTJayaSiua6s=";
# Workaround for
# `cc1plus: error: '-Wformat-security' ignored without '-Wformat' [-Werror=format-security]`
# when building jtreg
env.NIX_CFLAGS_COMPILE = "-Wformat";
postPatch =
let
cp = "cp -r --no-preserve=mode,ownership";
in
''
sed -i Makefile \
-e 's;git clone.*go-llama-ggml$;${cp} ${go-llama-ggml} sources/go-llama-ggml;' \
-e 's;git clone.*gpt4all$;${cp} ${gpt4all} sources/gpt4all;' \
-e 's;git clone.*go-piper$;${cp} ${go-piper} sources/go-piper;' \
-e 's;git clone.*go-rwkv$;${cp} ${go-rwkv} sources/go-rwkv;' \
-e 's;git clone.*whisper\.cpp$;${cp} ${whisper} sources/whisper\.cpp;' \
-e 's;git clone.*go-bert$;${cp} ${go-bert} sources/go-bert;' \
-e 's;git clone.*diffusion$;${cp} ${if with_stablediffusion then go-stable-diffusion else go-stable-diffusion.src} sources/go-stable-diffusion;' \
-e 's;git clone.*go-tiny-dream$;${cp} ${go-tiny-dream'} sources/go-tiny-dream;' \
-e 's, && git checkout.*,,g' \
-e '/mod download/ d' \
sed -i backend/cpp/llama/Makefile \
-e 's;git clone.*llama\.cpp$;${cp} ${llama_cpp'} llama\.cpp;' \
-e 's, && git checkout.*,,g' \
''
;
modBuildPhase = ''
mkdir sources
make prepare-sources
go mod tidy -v
'';
proxyVendor = true;
buildPhase =
let
buildType =
assert (lib.count lib.id [ with_openblas with_cublas with_clblas ]) <= 1;
if with_openblas then "openblas"
else if with_cublas then "cublas"
else if with_clblas then "clblas"
else "";
buildFlags = [
"VERSION=v${version}"
"BUILD_TYPE=${buildType}"
"GO_TAGS=\"${builtins.concatStringsSep " " GO_TAGS}\""
]
++ lib.optional with_cublas "CUDA_LIBPATH=${cudaPackages.cuda_cudart}/lib";
in
''
mkdir sources
make ${builtins.concatStringsSep " " buildFlags} build
'';
installPhase = ''
install -Dt $out/bin ${pname}
'';
buildInputs = [
protobuf # provides also abseil_cpp as propagated build input
grpc
openssl
]
++ lib.optionals with_stablediffusion
[ opencv ]
++ lib.optionals with_tts
[ sonic spdlog fmt onnxruntime ]
++ lib.optionals with_cublas
[ cudaPackages.cudatoolkit cudaPackages.cuda_cudart ]
++ lib.optionals with_openblas
[ openblas.dev ]
++ lib.optionals with_clblas
[ clblast ocl-icd opencl-headers ]
;
# patching rpath with patchelf doens't work. The execuable
# raises an segmentation fault
postFixup = ''
wrapProgram $out/bin/${pname} \
'' + lib.optionalString with_cublas ''
--prefix LD_LIBRARY_PATH : "${cudaPackages.libcublas}/lib:${cudaPackages.cuda_cudart}/lib:/run/opengl-driver/lib" \
'' + lib.optionalString with_clblas ''
--prefix LD_LIBRARY_PATH : "${clblast}/lib:${ocl-icd}/lib" \
'' + lib.optionalString with_openblas ''
--prefix LD_LIBRARY_PATH : "${openblas}/lib" \
'' + ''
--prefix PATH : "${ffmpeg}/bin"
'';
nativeBuildInputs = [
ncurses
cmake
makeWrapper
]
++ lib.optional with_openblas pkg-config
++ lib.optional with_cublas cudaPackages.cuda_nvcc
;
passthru.features = {
inherit
with_cublas with_openblas with_tts with_stablediffusion
with_tinydream with_clblas;
};
passthru.tests = {
version = testers.testVersion {
package = self;
version = "v" + version;
};
health =
let
port = "8080";
in
testers.runNixOSTest {
name = pname + "-health";
nodes.machine = {
systemd.services.local-ai = {
wantedBy = [ "multi-user.target" ];
serviceConfig.ExecStart = "${self}/bin/local-ai --localai-config-dir . --address :${port}";
};
};
testScript = ''
machine.wait_for_open_port(${port})
machine.succeed("curl -f http://localhost:${port}/readyz")
'';
};
};
meta = with lib; {
description = "OpenAI alternative to run local LLMs, image and audio generation";
homepage = "https://localai.io";
license = licenses.mit;
maintainers = with maintainers; [ onny ck3d ];
platforms = platforms.linux;
broken =
# TODO: provide onnxruntime in the right way
with_tts
|| (with_tinydream && (lib.lessThan self.stdenv.cc.version "13"));
};
};
in
self

View File

@ -1,6 +1,7 @@
{ stdenv { stdenv
, lib , lib
, fetchFromGitHub , fetchFromGitHub
, rkbin
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -19,15 +20,16 @@ stdenv.mkDerivation {
mv bin doc $out/ mv bin doc $out/
''; '';
BL31_RK3568 = "bin/rk35/rk3568_ddr_1056MHz_v1.21.bin"; passthru = {
ROCKCHIP_TPL_RK3568 = "bin/rk35/rk3568_ddr_1056MHz_v1.21.bin"; BL31_RK3568 = "${rkbin}/bin/rk35/rk3568_bl31_v1.44.elf";
TPL_RK3568 = "${rkbin}/bin/rk35/rk3568_ddr_1056MHz_v1.21.bin";
ROCKCHIP_TPL_RK3588 = "bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.16.bin"; TPL_RK3588 = "${rkbin}/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.16.bin";
};
meta = with lib; { meta = with lib; {
description = "Rockchip proprietary bootloader blobs"; description = "Rockchip proprietary bootloader blobs";
homepage = "https://github.com/rockchip-linux/rkbin"; homepage = "https://github.com/rockchip-linux/rkbin";
license = licenses.unfree; license = licenses.unfreeRedistributable;
maintainers = with maintainers; [ thefossguy ]; maintainers = with maintainers; [ thefossguy ];
platforms = [ "aarch64-linux" ]; platforms = [ "aarch64-linux" ];
}; };

View File

@ -95,7 +95,7 @@ version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
dependencies = [ dependencies = [
"hermit-abi 0.1.19", "hermit-abi",
"libc", "libc",
"winapi", "winapi",
] ]
@ -203,7 +203,7 @@ dependencies = [
"heck", "heck",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.38", "syn",
] ]
[[package]] [[package]]
@ -276,11 +276,10 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
[[package]] [[package]]
name = "colored" name = "colored"
version = "2.0.4" version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6" checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8"
dependencies = [ dependencies = [
"is-terminal",
"lazy_static", "lazy_static",
"windows-sys 0.48.0", "windows-sys 0.48.0",
] ]
@ -321,7 +320,7 @@ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"scratch", "scratch",
"syn 2.0.38", "syn",
] ]
[[package]] [[package]]
@ -338,18 +337,18 @@ checksum = "587663dd5fb3d10932c8aecfe7c844db1bcf0aee93eeab08fac13dc1212c2e7f"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.38", "syn",
] ]
[[package]] [[package]]
name = "derivative" name = "derive-where"
version = "2.2.0" version = "1.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 1.0.109", "syn",
] ]
[[package]] [[package]]
@ -370,16 +369,6 @@ version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
[[package]]
name = "errno"
version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860"
dependencies = [
"libc",
"windows-sys 0.48.0",
]
[[package]] [[package]]
name = "eyre" name = "eyre"
version = "0.6.8" version = "0.6.8"
@ -423,24 +412,12 @@ dependencies = [
"libc", "libc",
] ]
[[package]]
name = "hermit-abi"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
[[package]] [[package]]
name = "indenter" name = "indenter"
version = "0.3.3" version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
[[package]]
name = "indoc"
version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306"
[[package]] [[package]]
name = "indoc" name = "indoc"
version = "2.0.4" version = "2.0.4"
@ -460,22 +437,11 @@ dependencies = [
"yaml-rust", "yaml-rust",
] ]
[[package]]
name = "is-terminal"
version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
dependencies = [
"hermit-abi 0.3.3",
"rustix",
"windows-sys 0.48.0",
]
[[package]] [[package]]
name = "itertools" name = "itertools"
version = "0.10.5" version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0"
dependencies = [ dependencies = [
"either", "either",
] ]
@ -513,20 +479,15 @@ version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
[[package]]
name = "linux-raw-sys"
version = "0.4.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f"
[[package]] [[package]]
name = "local-impl" name = "local-impl"
version = "0.1.0" version = "0.1.2"
source = "git+https://gitlab.com/sornas/local-impl#09293b492c653d78bb2f5fd64187e0c68ea51733" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e36d656622c9ac5c84be07696931c71e483d27daf86914d7011d0fa6370418b"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 1.0.109", "syn",
] ]
[[package]] [[package]]
@ -565,7 +526,7 @@ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"regex-syntax 0.6.29", "regex-syntax 0.6.29",
"syn 2.0.38", "syn",
] ]
[[package]] [[package]]
@ -600,9 +561,9 @@ checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
[[package]] [[package]]
name = "memoffset" name = "memoffset"
version = "0.8.0" version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c"
dependencies = [ dependencies = [
"autocfg", "autocfg",
] ]
@ -796,30 +757,6 @@ dependencies = [
"pad", "pad",
] ]
[[package]]
name = "proc-macro-error"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
dependencies = [
"proc-macro-error-attr",
"proc-macro2",
"quote",
"syn 1.0.109",
"version_check",
]
[[package]]
name = "proc-macro-error-attr"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
dependencies = [
"proc-macro2",
"quote",
"version_check",
]
[[package]] [[package]]
name = "proc-macro2" name = "proc-macro2"
version = "1.0.69" version = "1.0.69"
@ -831,27 +768,27 @@ dependencies = [
[[package]] [[package]]
name = "pyo3" name = "pyo3"
version = "0.18.3" version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3b1ac5b3731ba34fdaa9785f8d74d17448cd18f30cf19e0c7e7b1fdb5272109" checksum = "9a89dc7a5850d0e983be1ec2a463a171d20990487c3cfcd68b5363f1ee3d6fe0"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"eyre", "eyre",
"indoc 1.0.9", "indoc",
"libc", "libc",
"memoffset", "memoffset",
"parking_lot", "parking_lot",
"pyo3-build-config", "pyo3-build-config",
"pyo3-ffi", "pyo3-ffi",
"pyo3-macros", "pyo3-macros",
"unindent 0.1.11", "unindent",
] ]
[[package]] [[package]]
name = "pyo3-build-config" name = "pyo3-build-config"
version = "0.18.3" version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9cb946f5ac61bb61a5014924910d936ebd2b23b705f7a4a3c40b05c720b079a3" checksum = "07426f0d8fe5a601f26293f300afd1a7b1ed5e78b2a705870c5f30893c5163be"
dependencies = [ dependencies = [
"once_cell", "once_cell",
"target-lexicon", "target-lexicon",
@ -859,9 +796,9 @@ dependencies = [
[[package]] [[package]]
name = "pyo3-ffi" name = "pyo3-ffi"
version = "0.18.3" version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd4d7c5337821916ea2a1d21d1092e8443cf34879e53a0ac653fbb98f44ff65c" checksum = "dbb7dec17e17766b46bca4f1a4215a85006b4c2ecde122076c562dd058da6cf1"
dependencies = [ dependencies = [
"libc", "libc",
"pyo3-build-config", "pyo3-build-config",
@ -869,25 +806,26 @@ dependencies = [
[[package]] [[package]]
name = "pyo3-macros" name = "pyo3-macros"
version = "0.18.3" version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a9d39c55dab3fc5a4b25bbd1ac10a2da452c4aca13bb450f22818a002e29648d" checksum = "05f738b4e40d50b5711957f142878cfa0f28e054aa0ebdfc3fd137a843f74ed3"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"pyo3-macros-backend", "pyo3-macros-backend",
"quote", "quote",
"syn 1.0.109", "syn",
] ]
[[package]] [[package]]
name = "pyo3-macros-backend" name = "pyo3-macros-backend"
version = "0.18.3" version = "0.20.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97daff08a4c48320587b5224cc98d609e3c27b6d437315bd40b605c98eeb5918" checksum = "0fc910d4851847827daf9d6cdd4a823fbdaab5b8818325c5e97a86da79e8881f"
dependencies = [ dependencies = [
"heck",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 1.0.109", "syn",
] ]
[[package]] [[package]]
@ -970,19 +908,6 @@ version = "0.1.23"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
[[package]]
name = "rustix"
version = "0.38.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b426b0506e5d50a7d8dafcf2e81471400deb602392c7dd110815afb4eaf02a3"
dependencies = [
"bitflags 2.4.1",
"errno",
"libc",
"linux-raw-sys",
"windows-sys 0.48.0",
]
[[package]] [[package]]
name = "ryu" name = "ryu"
version = "1.0.15" version = "1.0.15"
@ -1018,7 +943,7 @@ checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.38", "syn",
] ]
[[package]] [[package]]
@ -1055,7 +980,7 @@ checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
[[package]] [[package]]
name = "spade" name = "spade"
version = "0.6.0" version = "0.7.0"
dependencies = [ dependencies = [
"atty", "atty",
"clap", "clap",
@ -1063,7 +988,7 @@ dependencies = [
"codespan-reporting 0.12.0", "codespan-reporting 0.12.0",
"color-eyre", "color-eyre",
"colored", "colored",
"indoc 2.0.4", "indoc",
"itertools", "itertools",
"logos", "logos",
"pretty_assertions", "pretty_assertions",
@ -1082,7 +1007,6 @@ dependencies = [
"spade-typeinference", "spade-typeinference",
"spade-types", "spade-types",
"spade-wordlength-inference", "spade-wordlength-inference",
"thiserror",
"tracing", "tracing",
"tracing-subscriber", "tracing-subscriber",
"tracing-tree", "tracing-tree",
@ -1090,7 +1014,7 @@ dependencies = [
[[package]] [[package]]
name = "spade-ast" name = "spade-ast"
version = "0.6.0" version = "0.7.0"
dependencies = [ dependencies = [
"num", "num",
"spade-common", "spade-common",
@ -1098,7 +1022,7 @@ dependencies = [
[[package]] [[package]]
name = "spade-ast-lowering" name = "spade-ast-lowering"
version = "0.6.0" version = "0.7.0"
dependencies = [ dependencies = [
"itertools", "itertools",
"local-impl", "local-impl",
@ -1116,7 +1040,7 @@ dependencies = [
[[package]] [[package]]
name = "spade-common" name = "spade-common"
version = "0.6.0" version = "0.7.0"
dependencies = [ dependencies = [
"codespan", "codespan",
"codespan-reporting 0.12.0", "codespan-reporting 0.12.0",
@ -1142,12 +1066,13 @@ dependencies = [
[[package]] [[package]]
name = "spade-diagnostics" name = "spade-diagnostics"
version = "0.6.0" version = "0.7.0"
dependencies = [ dependencies = [
"codespan", "codespan",
"codespan-reporting 0.12.0", "codespan-reporting 0.12.0",
"colored", "colored",
"insta", "insta",
"itertools",
"local-impl", "local-impl",
"logos", "logos",
"spade-ast", "spade-ast",
@ -1159,7 +1084,7 @@ dependencies = [
[[package]] [[package]]
name = "spade-hir" name = "spade-hir"
version = "0.6.0" version = "0.7.0"
dependencies = [ dependencies = [
"codespan-reporting 0.12.0", "codespan-reporting 0.12.0",
"colored", "colored",
@ -1177,12 +1102,12 @@ dependencies = [
[[package]] [[package]]
name = "spade-hir-lowering" name = "spade-hir-lowering"
version = "0.6.0" version = "0.7.0"
dependencies = [ dependencies = [
"codespan", "codespan",
"codespan-reporting 0.12.0", "codespan-reporting 0.12.0",
"colored", "colored",
"indoc 2.0.4", "indoc",
"itertools", "itertools",
"local-impl", "local-impl",
"num", "num",
@ -1192,6 +1117,7 @@ dependencies = [
"spade-common", "spade-common",
"spade-diagnostics", "spade-diagnostics",
"spade-hir", "spade-hir",
"spade-macros",
"spade-mir", "spade-mir",
"spade-typeinference", "spade-typeinference",
"spade-types", "spade-types",
@ -1202,24 +1128,23 @@ dependencies = [
[[package]] [[package]]
name = "spade-macros" name = "spade-macros"
version = "0.6.0" version = "0.7.0"
dependencies = [ dependencies = [
"proc-macro-error",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 1.0.109", "syn",
"trybuild", "trybuild",
] ]
[[package]] [[package]]
name = "spade-mir" name = "spade-mir"
version = "0.6.0" version = "0.7.0"
dependencies = [ dependencies = [
"codespan", "codespan",
"codespan-reporting 0.12.0", "codespan-reporting 0.12.0",
"colored", "colored",
"derivative", "derive-where",
"indoc 2.0.4", "indoc",
"itertools", "itertools",
"logos", "logos",
"nesty", "nesty",
@ -1234,10 +1159,9 @@ dependencies = [
[[package]] [[package]]
name = "spade-parser" name = "spade-parser"
version = "0.6.0" version = "0.7.0"
dependencies = [ dependencies = [
"codespan", "codespan",
"codespan-reporting 0.12.0",
"colored", "colored",
"itertools", "itertools",
"local-impl", "local-impl",
@ -1253,7 +1177,7 @@ dependencies = [
[[package]] [[package]]
name = "spade-python" name = "spade-python"
version = "0.6.0" version = "0.7.0"
dependencies = [ dependencies = [
"codespan-reporting 0.12.0", "codespan-reporting 0.12.0",
"color-eyre", "color-eyre",
@ -1282,7 +1206,7 @@ dependencies = [
[[package]] [[package]]
name = "spade-simulation-ext" name = "spade-simulation-ext"
version = "0.6.0" version = "0.7.0"
dependencies = [ dependencies = [
"codespan-reporting 0.12.0", "codespan-reporting 0.12.0",
"color-eyre", "color-eyre",
@ -1310,11 +1234,11 @@ dependencies = [
[[package]] [[package]]
name = "spade-tests" name = "spade-tests"
version = "0.6.0" version = "0.7.0"
dependencies = [ dependencies = [
"codespan-reporting 0.12.0", "codespan-reporting 0.12.0",
"colored", "colored",
"indoc 2.0.4", "indoc",
"insta", "insta",
"logos", "logos",
"pretty_assertions", "pretty_assertions",
@ -1333,12 +1257,12 @@ dependencies = [
"tracing", "tracing",
"tracing-subscriber", "tracing-subscriber",
"tracing-tree", "tracing-tree",
"unindent 0.2.3", "unindent",
] ]
[[package]] [[package]]
name = "spade-typeinference" name = "spade-typeinference"
version = "0.6.0" version = "0.7.0"
dependencies = [ dependencies = [
"assert_matches", "assert_matches",
"codespan", "codespan",
@ -1361,7 +1285,7 @@ dependencies = [
[[package]] [[package]]
name = "spade-types" name = "spade-types"
version = "0.6.0" version = "0.7.0"
dependencies = [ dependencies = [
"num", "num",
"serde", "serde",
@ -1370,7 +1294,7 @@ dependencies = [
[[package]] [[package]]
name = "spade-wordlength-inference" name = "spade-wordlength-inference"
version = "0.6.0" version = "0.7.0"
dependencies = [ dependencies = [
"codespan", "codespan",
"codespan-reporting 0.12.0", "codespan-reporting 0.12.0",
@ -1396,17 +1320,6 @@ version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
[[package]]
name = "syn"
version = "1.0.109"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
dependencies = [
"proc-macro2",
"quote",
"unicode-ident",
]
[[package]] [[package]]
name = "syn" name = "syn"
version = "2.0.38" version = "2.0.38"
@ -1456,7 +1369,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.38", "syn",
] ]
[[package]] [[package]]
@ -1488,7 +1401,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.38", "syn",
] ]
[[package]] [[package]]
@ -1579,12 +1492,6 @@ version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
[[package]]
name = "unindent"
version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c"
[[package]] [[package]]
name = "unindent" name = "unindent"
version = "0.2.3" version = "0.2.3"
@ -1628,12 +1535,6 @@ dependencies = [
"vcd", "vcd",
] ]
[[package]]
name = "version_check"
version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
[[package]] [[package]]
name = "winapi" name = "winapi"
version = "0.3.9" version = "0.3.9"

View File

@ -6,13 +6,13 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "spade"; pname = "spade";
version = "0.6.0"; version = "0.7.0";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "spade-lang"; owner = "spade-lang";
repo = "spade"; repo = "spade";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-MNMKUhXVBhSn91uTVCuxozJ2BVFQAX/YdnCPOztGQyM="; hash = "sha256-oJfOgWobjt+DAVdP465E8iLMJCdqhs0vzJJFgRqVAP8=";
# only needed for vatch, which contains test data # only needed for vatch, which contains test data
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
lockFile = ./Cargo.lock; lockFile = ./Cargo.lock;
outputHashes = { outputHashes = {
"codespan-0.12.0" = "sha256-3F2006BR3hyhxcUTaQiOjzTEuRECKJKjIDyXonS/lrE="; "codespan-0.12.0" = "sha256-3F2006BR3hyhxcUTaQiOjzTEuRECKJKjIDyXonS/lrE=";
"local-impl-0.1.0" = "sha256-w6kQ4wM/ZQJmOqmAAq9FFDzyt9xHOY14av5dsSIFRU0=";
"tracing-tree-0.2.0" = "sha256-/JNeAKjAXmKPh0et8958yS7joORDbid9dhFB0VUAhZc="; "tracing-tree-0.2.0" = "sha256-/JNeAKjAXmKPh0et8958yS7joORDbid9dhFB0VUAhZc=";
}; };
}; };

View File

@ -0,0 +1,45 @@
{ lib
, python3
, fetchFromGitHub
}:
python3.pkgs.buildPythonApplication rec {
pname = "uwhoisd";
version = "0.1.0-unstable-2024-02-24";
pyproject = true;
src = fetchFromGitHub {
owner = "Lookyloo";
repo = "uwhoisd";
rev = "31ce5e83b8fcf200098fd5120d9c856f3f80e3f7";
hash = "sha256-lnPGKF9pJ2NFIsx4HFdRip6R+vGVr9TYzvU89iwBc5g=";
};
pythonRelaxDeps = [
"beautifulsoup4"
"tornado"
];
build-system = with python3.pkgs; [
poetry-core
pythonRelaxDepsHook
];
propagatedBuildInputs = with python3.pkgs; [
beautifulsoup4
publicsuffix2
redis
tornado
] ++ redis.optional-dependencies.hiredis;
# Project has no tests
doCheck = false;
meta = with lib; {
description = "Universal WHOIS proxy server";
homepage = "https://github.com/Lookyloo/uwhoisd";
changelog = "https://github.com/Lookyloo/uwhoisd/blob/${version}/ChangeLog";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -18,15 +18,17 @@ mkCoqDerivation {
releaseRev = v: "v${v}"; releaseRev = v: "v${v}";
release."3.1".sha256 = "sha256-qQHis6554sG7NpCpWhT2wvelnxsrbEPVNv3fpxwxHMU=";
release."3.0".sha256 = "sha256-xEgx5HHDOimOJbNMtIVf/KG3XBemOS9XwoCoW6btyJ4="; release."3.0".sha256 = "sha256-xEgx5HHDOimOJbNMtIVf/KG3XBemOS9XwoCoW6btyJ4=";
release."2.3".sha256 = "sha256-whU1yvFFuxpwQutW41B/WBg5DrVZJW/Do/GuHtzuI3U=";
release."2.2".sha256 = "sha256-8BB6SToCrMZTtU78t2K+aExuxk9O1lCqVQaa8wabSm8="; release."2.2".sha256 = "sha256-8BB6SToCrMZTtU78t2K+aExuxk9O1lCqVQaa8wabSm8=";
release."2.1".sha256 = "sha256-895gZzwwX8hN9UUQRhcgRlphHANka9R0PRotfmSEelA="; release."2.1".sha256 = "sha256-895gZzwwX8hN9UUQRhcgRlphHANka9R0PRotfmSEelA=";
release."2.0".sha256 = "sha256-ySg3AviGGY5jXqqn1cP6lTw3aS5DhawXEwNUgj7pIjA="; release."2.0".sha256 = "sha256-ySg3AviGGY5jXqqn1cP6lTw3aS5DhawXEwNUgj7pIjA=";
inherit version; inherit version;
defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [ defaultVersion = with lib.versions; lib.switch [ coq.version mathcomp.version ] [
{ cases = [ (range "8.16" "8.19") (isGe "2.0") ]; out = "3.0"; } { cases = [ (range "8.16" "8.19") (isGe "2.0") ]; out = "3.1"; }
{ cases = [ (range "8.12" "8.19") (range "1.12" "1.19") ]; out = "2.2"; } { cases = [ (range "8.12" "8.19") (range "1.12" "1.19") ]; out = "2.3"; }
] null; ] null;
propagatedBuildInputs = [ mathcomp.algebra mathcomp.ssreflect mathcomp.fingroup ]; propagatedBuildInputs = [ mathcomp.algebra mathcomp.ssreflect mathcomp.fingroup ];

View File

@ -0,0 +1,60 @@
{ lib
, aiohttp
, aresponses
, arrow
, buildPythonPackage
, certifi
, fetchFromGitHub
, frozenlist
, poetry-core
, pytest-aiohttp
, pytestCheckHook
, pythonOlder
, yarl
}:
buildPythonPackage rec {
pname = "aiopinboard";
version = "2024.01.0";
pyproject = true;
disabled = pythonOlder "3.10";
src = fetchFromGitHub {
owner = "bachya";
repo = "aiopinboard";
rev = "refs/tags/${version}";
hash = "sha256-/N9r17e0ZvPmcqW/XtRyAENKCGRzWqeOSKPpWHHYomg=";
};
nativeBuildInputs = [
poetry-core
];
propagatedBuildInputs = [
aiohttp
arrow
certifi
frozenlist
yarl
];
nativeCheckInputs = [
aresponses
pytest-aiohttp
pytestCheckHook
];
pythonImportsCheck = [
"aiopinboard"
];
meta = with lib; {
description = "Library to interact with the Pinboard API";
homepage = "https://github.com/bachya/aiopinboard";
changelog = "https://github.com/bachya/aiopinboard/releases/tag/${version}";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -7,15 +7,16 @@
, pyelftools , pyelftools
, pytestCheckHook , pytestCheckHook
, pythonOlder , pythonOlder
, setuptools
, six , six
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "aws-lambda-builders"; pname = "aws-lambda-builders";
version = "1.47.0"; version = "1.47.0";
format = "setuptools"; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.8";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "awslabs"; owner = "awslabs";
@ -26,10 +27,14 @@ buildPythonPackage rec {
postPatch = '' postPatch = ''
substituteInPlace setup.py \ substituteInPlace setup.py \
--replace "version=read_version()," 'version="${version}",' --replace-fail "version=read_version()," 'version="${version}",'
''; '';
propagatedBuildInputs = [ build-system = [
setuptools
];
dependencies = [
six six
]; ];
@ -57,11 +62,17 @@ buildPythonPackage rec {
"TestPythonPipWorkflow" "TestPythonPipWorkflow"
"TestRubyWorkflow" "TestRubyWorkflow"
"TestRustCargo" "TestRustCargo"
"test_with_mocks"
# Tests which are passing locally but not on Hydra # Tests which are passing locally but not on Hydra
"test_copy_dependencies_action_1_multiple_files" "test_copy_dependencies_action_1_multiple_files"
"test_move_dependencies_action_1_multiple_files" "test_move_dependencies_action_1_multiple_files"
]; ];
disabledTestPaths = [
# Dotnet binary needed
"tests/integration/workflows/dotnet_clipackage/test_dotnet.py"
];
pythonImportsCheck = [ pythonImportsCheck = [
"aws_lambda_builders" "aws_lambda_builders"
]; ];

View File

@ -365,14 +365,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "boto3-stubs"; pname = "boto3-stubs";
version = "1.34.67"; version = "1.34.68";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-ClKKx4AgcKf5VSSCufiQn3MzxqNIq2he0UQH872kK+Q="; hash = "sha256-acmbKrPt9CTYiOLM1mqmrifqGc3ub36mDx057pwrdCY=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -9,7 +9,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "botocore-stubs"; pname = "botocore-stubs";
version = "1.34.67"; version = "1.34.68";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -17,7 +17,7 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
pname = "botocore_stubs"; pname = "botocore_stubs";
inherit version; inherit version;
hash = "sha256-ventoBzkmDwt3pQ68lRo6lb2dxUapTOqo5du41xuN7c="; hash = "sha256-9jHFtkpyC7WG+VugVwTBC7L5KClogrZEz6KU+zW1DdY=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -0,0 +1,54 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, setuptools
, pythonOlder
, pytestCheckHook
, ujson
}:
buildPythonPackage rec {
pname = "demoji";
version = "1.1.0";
pyproject = true;
disabled = pythonOlder "3.7";
src = fetchFromGitHub {
owner = "bsolomon1124";
repo = "demoji";
rev = "refs/tags/v${version}";
hash = "sha256-ojy4JiM6xvP9J40Z5uFCMUZvZtLZ1le2p/2/NfAUAtk=";
};
postPatch = ''
substituteInPlace setup.cfg \
--replace-fail "pytest-runner" ""
'';
build-system = [
setuptools
];
passthru.optional-dependencies = {
ujson = [
ujson
];
};
nativeCheckInputs = [
pytestCheckHook
];
pythonImportsCheck = [
"demoji"
];
meta = with lib; {
description = "Module to find/replace/remove emojis in text strings";
homepage = "https://github.com/bsolomon1124/demoji";
changelog = "https://github.com/bsolomon1124/demoji/blob/${version}/CHANGELOG.md";
license = licenses.asl20;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -11,7 +11,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "dirigera"; pname = "dirigera";
version = "1.0.10"; version = "1.0.11";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "Leggin"; owner = "Leggin";
repo = "dirigera"; repo = "dirigera";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-FuytNb+AiimKZPhX7qaxKvM4Y9NofvrzMGLW1PPu3Cw="; hash = "sha256-kZlmfoGbvSv13+UqCE73ToLfrzzQ9AOxefRTxUvxMCg=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -57,7 +57,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "dvc"; pname = "dvc";
version = "3.48.3"; version = "3.48.4";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -66,7 +66,7 @@ buildPythonPackage rec {
owner = "iterative"; owner = "iterative";
repo = "dvc"; repo = "dvc";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-NY3fwo7063hrgYK0a7/PLlPORxhqGgowNtLWo/CN+PY="; hash = "sha256-vO+i0BU8mQuLfgb1rcGRmlb8gpHsRxgdwuJHRERA4Pw=";
}; };
pythonRelaxDeps = [ pythonRelaxDeps = [

View File

@ -17,21 +17,21 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-cloud-pubsub"; pname = "google-cloud-pubsub";
version = "2.20.2"; version = "2.20.3";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-I2BG6oYCMMeI5NTqLQ8SKZzfHZSscexC7RoM4boo1m8="; hash = "sha256-dq8PF5UJ5DHSu+P1H0JiVng9yVm49FjBNwyxnW974LE=";
}; };
nativeBuildInputs = [ build-system = [
setuptools setuptools
]; ];
propagatedBuildInputs = [ dependencies = [
google-api-core google-api-core
grpc-google-iam-v1 grpc-google-iam-v1
grpcio grpcio

View File

@ -8,14 +8,15 @@
, pythonOlder , pythonOlder
, pythonRelaxDepsHook , pythonRelaxDepsHook
, pydantic , pydantic
, setuptools
, tqdm , tqdm
, typing-extensions , typing-extensions
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "google-generativeai"; pname = "google-generativeai";
version = "0.4.0"; version = "0.4.1";
format = "setuptools"; pyproject = true;
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -23,18 +24,19 @@ buildPythonPackage rec {
owner = "google"; owner = "google";
repo = "generative-ai-python"; repo = "generative-ai-python";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-SrWAjvSqfHGMOe1hM0R4CBTOn+NsQtzR6b0hVn75LqY="; hash = "sha256-+PRsxwy8Um6wCku9s7h8ERKEhcFsomEYAwYg+vpAGyg=";
}; };
pythonRelaxDeps = [ pythonRelaxDeps = [
"google-ai-generativelanguage" "google-ai-generativelanguage"
]; ];
nativeBuildInputs = [ build-system = [
pythonRelaxDepsHook pythonRelaxDepsHook
setuptools
]; ];
propagatedBuildInputs = [ dependencies = [
google-ai-generativelanguage google-ai-generativelanguage
google-auth google-auth
google-api-core google-api-core

View File

@ -23,7 +23,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "gto"; pname = "gto";
version = "1.7.0"; version = "1.7.1";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -32,14 +32,14 @@ buildPythonPackage rec {
owner = "iterative"; owner = "iterative";
repo = "gto"; repo = "gto";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-dovCItMhPKRSPfbTzM5dbz8hdygqrLdUi6gS4+G10ks="; hash = "sha256-fUi+/PW05EvgTnoEv1Im1BjZ07VzpZhyW0EjhLUqJGI=";
}; };
postPatch = '' postPatch = ''
substituteInPlace pyproject.toml \ substituteInPlace pyproject.toml \
--replace ', "setuptools_scm_git_archive==1.4.1"' "" --replace-fail ', "setuptools_scm_git_archive==1.4.1"' ""
substituteInPlace setup.cfg \ substituteInPlace setup.cfg \
--replace " --cov=gto --cov-report=term-missing --cov-report=xml" "" --replace-fail " --cov=gto --cov-report=term-missing --cov-report=xml" ""
''; '';
nativeBuildInputs = [ nativeBuildInputs = [
@ -88,10 +88,10 @@ buildPythonPackage rec {
meta = with lib; { meta = with lib; {
description = "Module for Git Tag Operations"; description = "Module for Git Tag Operations";
mainProgram = "gto";
homepage = "https://github.com/iterative/gto"; homepage = "https://github.com/iterative/gto";
changelog = "https://github.com/iterative/gto/releases/tag/${version}"; changelog = "https://github.com/iterative/gto/releases/tag/${version}";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ fab ]; maintainers = with maintainers; [ fab ];
mainProgram = "gto";
}; };
} }

View File

@ -11,12 +11,11 @@
, pytestCheckHook , pytestCheckHook
, python-lsp-jsonrpc , python-lsp-jsonrpc
, pythonOlder , pythonOlder
, pythonRelaxDepsHook
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "jedi-language-server"; pname = "jedi-language-server";
version = "0.41.1-unstable-2023-10-04"; version = "0.41.3";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -24,17 +23,12 @@ buildPythonPackage rec {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pappasam"; owner = "pappasam";
repo = pname; repo = pname;
rev = "c4c470cff67e54593a626b22d1b6b05e56fde3a3"; rev = "v${version}";
hash = "sha256-qFBni97B/GkabbznnZtWTG4dCHFkOx5UQjuevxq+Uvo="; hash = "sha256-+k4WOoEbVe7mlPyPj0ttBM+kmjq8V739yHi36BDYK2U=";
}; };
pythonRelaxDeps = [
"pygls"
];
nativeBuildInputs = [ nativeBuildInputs = [
poetry-core poetry-core
pythonRelaxDepsHook
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -25,7 +25,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "jsonargparse"; pname = "jsonargparse";
version = "4.27.6"; version = "4.27.7";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.11"; disabled = pythonOlder "3.11";
@ -34,7 +34,7 @@ buildPythonPackage rec {
owner = "omni-us"; owner = "omni-us";
repo = "jsonargparse"; repo = "jsonargparse";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-N34DRWty3QiXDPpHGUvLpQXtU4TQHxI32rizcwQdHBU="; hash = "sha256-JWa08jCdtP9xwLaTYw0024DogDC0WQvKZ8xRDTEhsvE=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -11,7 +11,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "lmcloud"; pname = "lmcloud";
version = "1.0.0"; version = "1.1.1";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.11"; disabled = pythonOlder "3.11";
@ -20,14 +20,14 @@ buildPythonPackage rec {
owner = "zweckj"; owner = "zweckj";
repo = "lmcloud"; repo = "lmcloud";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-Eu4vStCabPCLsrT7Z+iCaUN3cKowH1dJjDO5x++LFNM="; hash = "sha256-n9xm5r8Yed5icw1ADYyggUDwKgV5llkoBeiauuw1z/o=";
}; };
nativeBuildInputs = [ build-system = [
setuptools setuptools
]; ];
propagatedBuildInputs = [ dependencies = [
authlib authlib
bleak bleak
httpx httpx

View File

@ -15,14 +15,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "oauthenticator"; pname = "oauthenticator";
version = "16.2.1"; version = "16.3.0";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-qJrreq2GhJxrX9keZOYVzjihs0RCymad+MGErW5ecPc="; hash = "sha256-QMddGJUfafXoBxMCjlx1lH45a4Bab3AP4j8Px7JxYaQ=";
}; };
postPatch = '' postPatch = ''
@ -30,11 +30,11 @@ buildPythonPackage rec {
--replace-fail " --cov=oauthenticator" "" --replace-fail " --cov=oauthenticator" ""
''; '';
nativeBuildInputs = [ build-system = [
setuptools setuptools
]; ];
propagatedBuildInputs = [ dependencies = [
jupyterhub jupyterhub
]; ];

View File

@ -18,7 +18,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyenphase"; pname = "pyenphase";
version = "1.19.2"; version = "1.20.0";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.11"; disabled = pythonOlder "3.11";
@ -27,19 +27,19 @@ buildPythonPackage rec {
owner = "pyenphase"; owner = "pyenphase";
repo = "pyenphase"; repo = "pyenphase";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-opzoIYNsFERS5R40vm64o92PYz4+1e3ACFv3W6+EYsc="; hash = "sha256-/TyQ6oSA361at1VSr6dLefOOmbZP4otBgb/JDA2sNWo=";
}; };
postPatch = '' postPatch = ''
substituteInPlace pyproject.toml \ substituteInPlace pyproject.toml \
--replace " --cov=pyenphase --cov-report=term-missing:skip-covered" "" --replace-fail " --cov=pyenphase --cov-report=term-missing:skip-covered" ""
''; '';
nativeBuildInputs = [ build-system = [
poetry-core poetry-core
]; ];
propagatedBuildInputs = [ dependencies = [
awesomeversion awesomeversion
envoy-utils envoy-utils
httpx httpx

View File

@ -0,0 +1,45 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, poetry-core
, pythonOlder
, requests
}:
buildPythonPackage rec {
pname = "pylacus";
version = "1.8.2";
pyproject = true;
disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "ail-project";
repo = "PyLacus";
rev = "refs/tags/v${version}";
hash = "sha256-wXdQe/4Xw/D0MRFqNfSKimJ99aCE7M7k1neT/+t7ixY=";
};
build-system = [
poetry-core
];
dependencies = [
requests
];
# Tests require network access
doCheck = false;
pythonImportsCheck = [
"pylacus"
];
meta = with lib; {
description = "Module to enqueue and query a remote Lacus instance";
homepage = "https://github.com/ail-project/PyLacus";
changelog = "https://github.com/ail-project/PyLacus/releases/tag/v${version}";
license = licenses.bsd3;
maintainers = with maintainers; [ fab ];
};
}

View File

@ -1,14 +1,14 @@
{ lib { lib
, aiohttp
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, setuptools
, pythonOlder , pythonOlder
, aiohttp , setuptools
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pytedee-async"; pname = "pytedee-async";
version = "0.2.16"; version = "0.2.17";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -17,14 +17,14 @@ buildPythonPackage rec {
owner = "zweckj"; owner = "zweckj";
repo = "pytedee_async"; repo = "pytedee_async";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-MoAh5YYaZLF99fTFgErXunaLGT9hgInaZTjlDJcpSEw="; hash = "sha256-5mCHCzoDJ6+ao2guhAtVjvPaAS6Hutn+NwaQIjWDlgo=";
}; };
nativeBuildInputs = [ build-system = [
setuptools setuptools
]; ];
propagatedBuildInputs = [ dependencies = [
aiohttp aiohttp
]; ];

View File

@ -14,7 +14,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "tagoio-sdk"; pname = "tagoio-sdk";
version = "4.2.1"; version = "4.3.0";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.9"; disabled = pythonOlder "3.9";
@ -23,7 +23,7 @@ buildPythonPackage rec {
owner = "tago-io"; owner = "tago-io";
repo = "sdk-python"; repo = "sdk-python";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-R7qJIgL8/zejIuT6YMnC3bdm8lKLBTK5eVjVDEjvRKs="; hash = "sha256-37/fg2vbwYPhYPvSJ2YxWAPrfspqTE3thIL/VR1+AkI=";
}; };
pythonRelaxDeps = [ pythonRelaxDeps = [

View File

@ -5,14 +5,14 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "checkov"; pname = "checkov";
version = "3.2.42"; version = "3.2.43";
pyproject = true; pyproject = true;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bridgecrewio"; owner = "bridgecrewio";
repo = "checkov"; repo = "checkov";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-2ZhG7j9kV5E1I1xRzUKSONZ32T1oaDZ7linXjfFrvRg="; hash = "sha256-XzkMhI/+dOU0NJs9XW+jwbI6fZfC6cHFq0xFNw57kc8=";
}; };
patches = [ patches = [

View File

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "tflint-ruleset-aws"; pname = "tflint-ruleset-aws";
version = "0.29.0"; version = "0.30.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "terraform-linters"; owner = "terraform-linters";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-tqHlvJyLRhREKnuMUP479xuD0PjdCZfIMj4L44skiSE="; hash = "sha256-mgYvzxIzh/HibPM+BQoJ7dKqEifMcuoqfOIZU4KcRC4=";
}; };
vendorHash = "sha256-vEkrDwsetW4HtbcgkhcaK42v/CKfRlIoHgYzjoTavqk="; vendorHash = "sha256-JaOVNWF4JMXwGo+JVyknGZrd/M6F9c2PTgGadCqoRsk=";
# upstream Makefile also does a go test $(go list ./... | grep -v integration) # upstream Makefile also does a go test $(go list ./... | grep -v integration)
preCheck = '' preCheck = ''

View File

@ -10,7 +10,7 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "aws-sam-cli"; pname = "aws-sam-cli";
version = "1.110.0"; version = "1.113.0";
pyproject = true; pyproject = true;
disabled = python3.pythonOlder "3.8"; disabled = python3.pythonOlder "3.8";
@ -19,10 +19,10 @@ python3.pkgs.buildPythonApplication rec {
owner = "aws"; owner = "aws";
repo = "aws-sam-cli"; repo = "aws-sam-cli";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-FJHHEsdi2uGP9/GxrANsVEuxZiS4M4BPBGoARQBQpkA="; hash = "sha256-9DHqjhJfWkMJxu2gccbbuzoW9IxDqCBoi8slWnugeJM=";
}; };
nativeBuildInputs = with python3.pkgs; [ build-system = with python3.pkgs; [
pythonRelaxDepsHook pythonRelaxDepsHook
setuptools setuptools
]; ];
@ -42,7 +42,7 @@ python3.pkgs.buildPythonApplication rec {
"tzlocal" "tzlocal"
]; ];
propagatedBuildInputs = with python3.pkgs; [ dependencies = with python3.pkgs; [
aws-lambda-builders aws-lambda-builders
aws-sam-translator aws-sam-translator
boto3 boto3

View File

@ -7,13 +7,13 @@
buildGoModule rec { buildGoModule rec {
pname = "bearer"; pname = "bearer";
version = "1.43.0"; version = "1.43.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bearer"; owner = "bearer";
repo = "bearer"; repo = "bearer";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-oOQdFbctIwCvpccUipX+5dBvkUxlRiQE9ju/UCqSku0="; hash = "sha256-T5JiGoiVs6crbWiOPbjLpcHRdIovHAVUDAaa4e3ZDPc=";
}; };
vendorHash = "sha256-g0AnL6r3dUfCIAytTknAD5aCPBsohDUMNfMAYKBebi4="; vendorHash = "sha256-g0AnL6r3dUfCIAytTknAD5aCPBsohDUMNfMAYKBebi4=";

View File

@ -9,16 +9,16 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "cargo-deny"; pname = "cargo-deny";
version = "0.14.17"; version = "0.14.18";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "EmbarkStudios"; owner = "EmbarkStudios";
repo = "cargo-deny"; repo = "cargo-deny";
rev = version; rev = version;
hash = "sha256-ccj9BvvEtTsiV6jfrmLsQGDfem9f8L7rfCY8lK4cC+Y="; hash = "sha256-aVWr7YXGpRDItub4CaUg9LYxj9Nf0Pe1L0FUr9bJoG0=";
}; };
cargoHash = "sha256-pdVHBOxwhPgSl0+zoAobchxVkhtdx5/F/Rpp2uPx1K4="; cargoHash = "sha256-AD4WFM0yAIKgi9y8015qxukAa3YBJmPnkUhV7qp0quk=";
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config

View File

@ -377,8 +377,14 @@ in {
defconfig = "orangepi-5-rk3588s_defconfig"; defconfig = "orangepi-5-rk3588s_defconfig";
extraMeta.platforms = ["aarch64-linux"]; extraMeta.platforms = ["aarch64-linux"];
BL31 = "${armTrustedFirmwareRK3588}/bl31.elf"; BL31 = "${armTrustedFirmwareRK3588}/bl31.elf";
ROCKCHIP_TPL = "${rkbin}/${rkbin.ROCKCHIP_TPL_RK3588}"; ROCKCHIP_TPL = rkbin.TPL_RK3588;
filesToInstall = [ "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" ];
# FIXME: applied upstream, remove in 2024.04
extraConfig = ''
CONFIG_ROCKCHIP_SPI_IMAGE=y
'';
filesToInstall = [ "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" "u-boot-rockchip-spi.bin" ];
}; };
ubootOrangePiPc = buildUBoot { ubootOrangePiPc = buildUBoot {
@ -529,7 +535,7 @@ in {
defconfig = "rock5b-rk3588_defconfig"; defconfig = "rock5b-rk3588_defconfig";
extraMeta.platforms = ["aarch64-linux"]; extraMeta.platforms = ["aarch64-linux"];
BL31 = "${armTrustedFirmwareRK3588}/bl31.elf"; BL31 = "${armTrustedFirmwareRK3588}/bl31.elf";
ROCKCHIP_TPL = "${rkbin}/${rkbin.ROCKCHIP_TPL_RK3588}"; ROCKCHIP_TPL = rkbin.TPL_RK3588;
filesToInstall = [ "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" "u-boot-rockchip-spi.bin" ]; filesToInstall = [ "u-boot.itb" "idbloader.img" "u-boot-rockchip.bin" "u-boot-rockchip-spi.bin" ];
}; };

View File

@ -2,20 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "dpdk-kmods"; pname = "dpdk-kmods";
version = "2022-08-29"; version = "2023-02-05";
src = fetchzip { src = fetchzip {
url = "https://git.dpdk.org/dpdk-kmods/snapshot/dpdk-kmods-4a589f7bed00fc7009c93d430bd214ac7ad2bb6b.tar.xz"; url = "https://git.dpdk.org/dpdk-kmods/snapshot/dpdk-kmods-e721c733cd24206399bebb8f0751b0387c4c1595.tar.xz";
sha256 = "sha256-l9asJuw2nl63I1BxK6udy2pNunRiMJxyoXeg9V5+WgI="; sha256 = "sha256-AG5Lthp+CPR4R7I23DUmoWAmET8gLEFHHdjk2TUbQn4=";
}; };
patches = [
(fetchpatch {
url = "https://git.launchpad.net/ubuntu/+source/dpdk-kmods/plain/debian/patches/0001-support-linux-5.18.patch?id=9d628c02c169d8190bc2cb6afd81e4d364c382cd";
sha256 = "sha256-j4kpx1DOnmf5lFxOhaVFNT7prEy1jrJERX2NFaybTPU=";
})
];
hardeningDisable = [ "pic" ]; hardeningDisable = [ "pic" ];
makeFlags = kernel.makeFlags ++ [ makeFlags = kernel.makeFlags ++ [
@ -39,5 +32,6 @@ stdenv.mkDerivation rec {
license = licenses.gpl2Only; license = licenses.gpl2Only;
maintainers = [ maintainers.mic92 ]; maintainers = [ maintainers.mic92 ];
platforms = platforms.linux; platforms = platforms.linux;
broken = kernel.isHardened;
}; };
} }

View File

@ -1,5 +1,4 @@
{ stdenv, lib { stdenv, lib
, kernel
, fetchurl , fetchurl
, pkg-config, meson, ninja, makeWrapper , pkg-config, meson, ninja, makeWrapper
, libbsd, numactl, libbpf, zlib, elfutils, jansson, openssl, libpcap, rdma-core , libbsd, numactl, libbpf, zlib, elfutils, jansson, openssl, libpcap, rdma-core
@ -13,16 +12,13 @@
) )
}: }:
let stdenv.mkDerivation rec {
mod = kernel != null;
dpdkVersion = "23.07";
in stdenv.mkDerivation {
pname = "dpdk"; pname = "dpdk";
version = "${dpdkVersion}" + lib.optionalString mod "-${kernel.version}"; version = "23.11";
src = fetchurl { src = fetchurl {
url = "https://fast.dpdk.org/rel/dpdk-${dpdkVersion}.tar.xz"; url = "https://fast.dpdk.org/rel/dpdk-${version}.tar.xz";
sha256 = "sha256-4IYU6K65KUB9c9cWmZKJpE70A0NSJx8JOX7vkysjs9Y="; sha256 = "sha256-ZPpY/fyelRDo5BTjvt0WW9PUykZaIxsoAyP4PNU/2GU=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -44,7 +40,7 @@ in stdenv.mkDerivation {
openssl.dev openssl.dev
zlib zlib
python3 python3
] ++ lib.optionals mod kernel.moduleBuildDependencies; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
# Propagated to support current DPDK users in nixpkgs which statically link # Propagated to support current DPDK users in nixpkgs which statically link
@ -56,21 +52,15 @@ in stdenv.mkDerivation {
postPatch = '' postPatch = ''
patchShebangs config/arm buildtools patchShebangs config/arm buildtools
'' + lib.optionalString mod ''
# kernel_install_dir is hardcoded to `/lib/modules`; patch that.
sed -i "s,kernel_install_dir *= *['\"].*,kernel_install_dir = '$kmod/lib/modules/${kernel.modDirVersion}'," kernel/linux/meson.build
''; '';
mesonFlags = [ mesonFlags = [
"-Dtests=false" "-Dtests=false"
"-Denable_docs=true" "-Denable_docs=true"
"-Denable_kmods=${lib.boolToString mod}" "-Ddeveloper_mode=disabled"
] ]
# kni kernel driver is currently not compatble with 5.11
++ lib.optional (mod && kernel.kernelOlder "5.11") "-Ddisable_drivers=kni"
++ [(if shared then "-Ddefault_library=shared" else "-Ddefault_library=static")] ++ [(if shared then "-Ddefault_library=shared" else "-Ddefault_library=static")]
++ lib.optional (machine != null) "-Dmachine=${machine}" ++ lib.optional (machine != null) "-Dmachine=${machine}"
++ lib.optional mod "-Dkernel_dir=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
++ lib.optional (withExamples != []) "-Dexamples=${builtins.concatStringsSep "," withExamples}"; ++ lib.optional (withExamples != []) "-Dexamples=${builtins.concatStringsSep "," withExamples}";
postInstall = '' postInstall = ''
@ -87,7 +77,6 @@ in stdenv.mkDerivation {
outputs = outputs =
[ "out" "doc" ] [ "out" "doc" ]
++ lib.optional mod "kmod"
++ lib.optional (withExamples != []) "examples"; ++ lib.optional (withExamples != []) "examples";
meta = with lib; { meta = with lib; {
@ -96,6 +85,5 @@ in stdenv.mkDerivation {
license = with licenses; [ lgpl21 gpl2 bsd2 ]; license = with licenses; [ lgpl21 gpl2 bsd2 ];
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ magenbluten orivej mic92 zhaofengli ]; maintainers = with maintainers; [ magenbluten orivej mic92 zhaofengli ];
broken = mod && kernel.isHardened;
}; };
} }

View File

@ -18,23 +18,15 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pktgen"; pname = "pktgen";
version = "22.07.1"; version = "23.10.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "pktgen"; owner = "pktgen";
repo = "Pktgen-DPDK"; repo = "Pktgen-DPDK";
rev = "pktgen-${version}"; rev = "pktgen-${version}";
sha256 = "sha256-wBLGwVdn3ymUTVv7J/kbQYz4WNIgV246PHg51+FStUo="; sha256 = "sha256-eujVEU+XkxF1kIGQJoBW3oXXNSqBEzx6mwR2XYoHinM=";
}; };
patches = [
(fetchpatch {
# Ealier DPDK deprecated some macros, which were finally removed in >= 22.11
url = "https://github.com/pktgen/Pktgen-DPDK/commit/089ef94ac04629f7380f5e618443bcacb2cef5ab.patch";
sha256 = "sha256-ITU/dIfu7QPpdIVYuCuDhDG9rVF+n8i1YYn9bFmQUME=";
})
];
nativeBuildInputs = [ meson ninja pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config ];
buildInputs = [ buildInputs = [
@ -47,9 +39,7 @@ stdenv.mkDerivation rec {
GUI = lib.optionalString withGtk "true"; GUI = lib.optionalString withGtk "true";
env.NIX_CFLAGS_COMPILE = toString [ env.NIX_CFLAGS_COMPILE = toString [
# Needed with GCC 12 "-Wno-error=sign-compare"
"-Wno-error=address"
"-Wno-error=use-after-free"
]; ];
# requires symbols from this file # requires symbols from this file

View File

@ -8,13 +8,13 @@
buildGoModule rec { buildGoModule rec {
pname = "qovery-cli"; pname = "qovery-cli";
version = "0.84.5"; version = "0.85.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Qovery"; owner = "Qovery";
repo = "qovery-cli"; repo = "qovery-cli";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-ehf0XcDYCas3bJtrt/aC3vGBHH+hNhQJgetRKfNk3Vg="; hash = "sha256-peIbzUDP6vJneeFkvIUXuMzOQJKZ602dIzRnSf/7HAI=";
}; };
vendorHash = "sha256-3UsHxBIJpmga3Hjtwx4cZ45xY52RVMdPS/DAgTBYmuw="; vendorHash = "sha256-3UsHxBIJpmga3Hjtwx4cZ45xY52RVMdPS/DAgTBYmuw=";

View File

@ -5,18 +5,18 @@
buildGoModule rec { buildGoModule rec {
pname = "cnspec"; pname = "cnspec";
version = "10.8.2"; version = "10.8.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mondoohq"; owner = "mondoohq";
repo = "cnspec"; repo = "cnspec";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-F38qymDYAV2hc1jKrnyot6rk/vDPAvH+DP/JhucmZkE="; hash = "sha256-emY8y+OKk052o5LGhHMra7CTpbmS/U+5sjWIYR7DRsA=";
}; };
proxyVendor = true; proxyVendor = true;
vendorHash = "sha256-w8iGRPnYbyNeHZ+cOA6K4GJdsIyES5zC3A70r9BEFuY="; vendorHash = "sha256-W39Ccc5UU+K+W/h/R1vrB1lcJXKZs8gbfxmb99vGEfM=";
subPackages = [ subPackages = [
"apps/cnspec" "apps/cnspec"

View File

@ -1,4 +1,4 @@
# frozen_string_literal: true # frozen_string_literal: true
source "https://rubygems.org" source "https://rubygems.org"
gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.3.60" gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.4.0"

View File

@ -1,9 +1,9 @@
GIT GIT
remote: https://github.com/rapid7/metasploit-framework remote: https://github.com/rapid7/metasploit-framework
revision: 5df84967c30bc92484c217aa70754596ff358ad0 revision: c82de1374a222da3ca6db840432a971cfd4e865e
ref: refs/tags/6.3.60 ref: refs/tags/6.4.0
specs: specs:
metasploit-framework (6.3.60) metasploit-framework (6.4.0)
actionpack (~> 7.0.0) actionpack (~> 7.0.0)
activerecord (~> 7.0.0) activerecord (~> 7.0.0)
activesupport (~> 7.0.0) activesupport (~> 7.0.0)
@ -83,7 +83,7 @@ GIT
rex-zip rex-zip
ruby-macho ruby-macho
ruby-mysql ruby-mysql
ruby_smb (~> 3.3.0) ruby_smb (~> 3.3.3)
rubyntlm rubyntlm
rubyzip rubyzip
sinatra sinatra
@ -166,7 +166,7 @@ GEM
bcrypt (3.1.20) bcrypt (3.1.20)
bcrypt_pbkdf (1.1.0) bcrypt_pbkdf (1.1.0)
bigdecimal (3.1.6) bigdecimal (3.1.6)
bindata (2.5.0) bindata (2.4.15)
bootsnap (1.18.3) bootsnap (1.18.3)
msgpack (~> 1.2) msgpack (~> 1.2)
bson (5.0.0) bson (5.0.0)
@ -398,8 +398,8 @@ GEM
ruby-mysql (4.1.0) ruby-mysql (4.1.0)
ruby-rc4 (0.1.5) ruby-rc4 (0.1.5)
ruby2_keywords (0.0.5) ruby2_keywords (0.0.5)
ruby_smb (3.3.2) ruby_smb (3.3.4)
bindata bindata (= 2.4.15)
openssl-ccm openssl-ccm
openssl-cmac openssl-cmac
rubyntlm rubyntlm

View File

@ -15,13 +15,13 @@ let
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "metasploit-framework"; pname = "metasploit-framework";
version = "6.3.60"; version = "6.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rapid7"; owner = "rapid7";
repo = "metasploit-framework"; repo = "metasploit-framework";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-K4NBMaoWpxbyKCtkHYzPJSIM27yY8MZZDXAuJM9T1ZE="; hash = "sha256-1OWgQgnmsKxGHzX2ly/7xIJH4BcWUV6SjScxB5bMhu0=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -234,10 +234,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "08r67nglsqnxrbn803szf5bdnqhchhq8kf2by94f37fcl65wpp19"; sha256 = "04y4zgh4bbcb8wmkxwfqg4saky1d1f3xw8z6yk543q13h8ky8rz5";
type = "gem"; type = "gem";
}; };
version = "2.5.0"; version = "2.4.15";
}; };
bootsnap = { bootsnap = {
groups = ["default"]; groups = ["default"];
@ -674,12 +674,12 @@
platforms = []; platforms = [];
source = { source = {
fetchSubmodules = false; fetchSubmodules = false;
rev = "5df84967c30bc92484c217aa70754596ff358ad0"; rev = "c82de1374a222da3ca6db840432a971cfd4e865e";
sha256 = "14fmag7j8bkh1mcwdw4qpkdhq8i5ry61sr1b53r1d9qnm8ql30rb"; sha256 = "1vc6rjb0fc97in95wl8n2zh4g0n4zcprgxim3x3arc76151a1rfl";
type = "git"; type = "git";
url = "https://github.com/rapid7/metasploit-framework"; url = "https://github.com/rapid7/metasploit-framework";
}; };
version = "6.3.60"; version = "6.4.0";
}; };
metasploit-model = { metasploit-model = {
groups = ["default"]; groups = ["default"];
@ -1397,10 +1397,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "1yy5z53mp2l3d8k8dhf8s8hbscmgd829j50nfcgmqrli0vvz0s1a"; sha256 = "0wcbglknz86qf7sbsns84a35a0vvfn9cn1cbhf9ycjwh6nqxhcim";
type = "gem"; type = "gem";
}; };
version = "3.3.2"; version = "3.3.4";
}; };
rubyntlm = { rubyntlm = {
groups = ["default"]; groups = ["default"];

View File

@ -7,16 +7,16 @@
buildGoModule rec { buildGoModule rec {
pname = "trufflehog"; pname = "trufflehog";
version = "3.70.2"; version = "3.70.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "trufflesecurity"; owner = "trufflesecurity";
repo = "trufflehog"; repo = "trufflehog";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-bw9Pjl3t3QEahKcpjh1IC4nWL4iLIr6P0aNPDNOQi1k="; hash = "sha256-eTxqNsTcdYqflY5i6tV/4uL9jV2MPwVeWspXfjX8Xmc=";
}; };
vendorHash = "sha256-T8XLYTLQLgwJYaHC4erBt1fadSjmLtrykPJGiFioBRI="; vendorHash = "sha256-VYF9QIlshfFkNbfEQlJsp1SbGsGVTwnGLdKprKOeB74=";
ldflags = [ ldflags = [
"-s" "-s"

View File

@ -27683,9 +27683,7 @@ with pkgs;
cryptodev = linuxPackages.cryptodev; cryptodev = linuxPackages.cryptodev;
dpdk = callPackage ../os-specific/linux/dpdk { dpdk = callPackage ../os-specific/linux/dpdk { };
kernel = null; # dpdk modules are in linuxPackages.dpdk.kmod
};
keyutils = callPackage ../os-specific/linux/keyutils { }; keyutils = callPackage ../os-specific/linux/keyutils { };

View File

@ -309,6 +309,7 @@ in {
inherit (pkgs) odp-dpdk pktgen; # added 2018-05 inherit (pkgs) odp-dpdk pktgen; # added 2018-05
inherit (pkgs) bcc bpftrace; # added 2021-12 inherit (pkgs) bcc bpftrace; # added 2021-12
inherit (pkgs) oci-seccomp-bpf-hook; # added 2022-11 inherit (pkgs) oci-seccomp-bpf-hook; # added 2022-11
inherit (pkgs) dpdk; # added 2024-03
acpi_call = callPackage ../os-specific/linux/acpi-call {}; acpi_call = callPackage ../os-specific/linux/acpi-call {};
@ -345,8 +346,6 @@ in {
dpdk-kmods = callPackage ../os-specific/linux/dpdk-kmods { }; dpdk-kmods = callPackage ../os-specific/linux/dpdk-kmods { };
dpdk = pkgs.dpdk.override { inherit kernel; };
exfat-nofuse = if lib.versionOlder kernel.version "5.8" then callPackage ../os-specific/linux/exfat { } else null; exfat-nofuse = if lib.versionOlder kernel.version "5.8" then callPackage ../os-specific/linux/exfat { } else null;
evdi = callPackage ../os-specific/linux/evdi { }; evdi = callPackage ../os-specific/linux/evdi { };

View File

@ -341,6 +341,8 @@ self: super: with self; {
aiopg = callPackage ../development/python-modules/aiopg { }; aiopg = callPackage ../development/python-modules/aiopg { };
aiopinboard = callPackage ../development/python-modules/aiopinboard { };
aioprocessing = callPackage ../development/python-modules/aioprocessing { }; aioprocessing = callPackage ../development/python-modules/aioprocessing { };
aioprometheus = callPackage ../development/python-modules/aioprometheus { }; aioprometheus = callPackage ../development/python-modules/aioprometheus { };
@ -2868,6 +2870,8 @@ self: super: with self; {
demjson3 = callPackage ../development/python-modules/demjson3 { }; demjson3 = callPackage ../development/python-modules/demjson3 { };
demoji = callPackage ../development/python-modules/demoji { };
dendropy = callPackage ../development/python-modules/dendropy { }; dendropy = callPackage ../development/python-modules/dendropy { };
denonavr = callPackage ../development/python-modules/denonavr { }; denonavr = callPackage ../development/python-modules/denonavr { };
@ -10962,6 +10966,8 @@ self: super: with self; {
pylacrosse = callPackage ../development/python-modules/pylacrosse { }; pylacrosse = callPackage ../development/python-modules/pylacrosse { };
pylacus = callPackage ../development/python-modules/pylacus { };
pylama = callPackage ../development/python-modules/pylama { }; pylama = callPackage ../development/python-modules/pylama { };
pylast = callPackage ../development/python-modules/pylast { }; pylast = callPackage ../development/python-modules/pylast { };