Merge staging-next into staging
This commit is contained in:
@@ -25,7 +25,7 @@ For new packages please briefly describe the package or provide a link to its ho
|
||||
- made sure NixOS tests are [linked](https://github.com/NixOS/nixpkgs/blob/master/pkgs/README.md#linking-nixos-module-tests-to-a-package) to the relevant packages
|
||||
- [ ] Tested compilation of all packages that depend on this change using `nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"`. Note: all changes have to be committed, also see [nixpkgs-review usage](https://github.com/Mic92/nixpkgs-review#usage)
|
||||
- [ ] Tested basic functionality of all binary files (usually in `./result/bin/`)
|
||||
- [24.11 Release Notes](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2411.section.md) (or backporting [23.11](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2311.section.md) and [24.05](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2405.section.md) Release notes)
|
||||
- [25.05 Release Notes](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2505.section.md) (or backporting [24.11](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2411.section.md) and [25.05](https://github.com/NixOS/nixpkgs/blob/master/nixos/doc/manual/release-notes/rl-2505.section.md) Release notes)
|
||||
- [ ] (Package updates) Added a release notes entry if the change is major or breaking
|
||||
- [ ] (Module updates) Added a release notes entry if the change is significant
|
||||
- [ ] (Module addition) Added a release notes entry if adding a new NixOS module
|
||||
|
||||
@@ -39,6 +39,10 @@ jobs:
|
||||
into: staging-next-24.05
|
||||
- from: staging-next-24.05
|
||||
into: staging-24.05
|
||||
- from: release-24.11
|
||||
into: staging-next-24.11
|
||||
- from: staging-next-24.11
|
||||
into: staging-24.11
|
||||
name: ${{ matrix.pairs.from }} → ${{ matrix.pairs.into }}
|
||||
steps:
|
||||
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
|
||||
|
||||
+1
-1
@@ -345,7 +345,7 @@ See [Nix Channel Status](https://status.nixos.org/) for the current channels and
|
||||
Here's a brief overview of the main Git branches and what channels they're used for:
|
||||
|
||||
- `master`: The main branch, used for the unstable channels such as `nixpkgs-unstable`, `nixos-unstable` and `nixos-unstable-small`.
|
||||
- `release-YY.MM` (e.g. `release-24.05`): The NixOS release branches, used for the stable channels such as `nixos-24.05`, `nixos-24.05-small` and `nixpkgs-24.05-darwin`.
|
||||
- `release-YY.MM` (e.g. `release-24.11`): The NixOS release branches, used for the stable channels such as `nixos-24.11`, `nixos-24.11-small` and `nixpkgs-24.11-darwin`.
|
||||
|
||||
When a channel is updated, a corresponding Git branch is also updated to point to the corresponding commit.
|
||||
So e.g. the [`nixpkgs-unstable` branch](https://github.com/nixos/nixpkgs/tree/nixpkgs-unstable) corresponds to the Git commit from the [`nixpkgs-unstable` channel](https://channels.nixos.org/nixpkgs-unstable).
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
24.11
|
||||
25.05
|
||||
+1
-1
@@ -415,7 +415,7 @@ in {
|
||||
On each release the first letter is bumped and a new animal is chosen
|
||||
starting with that new letter.
|
||||
*/
|
||||
codeName = "Vicuna";
|
||||
codeName = "Warbler";
|
||||
|
||||
/**
|
||||
Returns the current nixpkgs version suffix as string.
|
||||
|
||||
@@ -15915,6 +15915,12 @@
|
||||
githubId = 30374463;
|
||||
name = "Michal S.";
|
||||
};
|
||||
notthebee = {
|
||||
email = "moe@notthebe.ee";
|
||||
github = "notthebee";
|
||||
githubId = 30384331;
|
||||
name = "Wolfgang";
|
||||
};
|
||||
notthemessiah = {
|
||||
email = "brian.cohen.88@gmail.com";
|
||||
github = "NOTtheMessiah";
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
This section lists the release notes for each stable version of NixOS and current unstable revision.
|
||||
|
||||
```{=include=} sections
|
||||
rl-2505.section.md
|
||||
rl-2411.section.md
|
||||
rl-2405.section.md
|
||||
rl-2311.section.md
|
||||
|
||||
@@ -311,6 +311,9 @@
|
||||
- The `mautrix-signal` module was adapted to incorporate the configuration changes that resulted from the update to the mautrix bridgev2 architecture. Pre-0.7.0 configurations should continue to work.
|
||||
In case you want to update your configuration, make sure to check the NixOS manual.
|
||||
|
||||
- `cargo-tauri` has been updated to major version 2. Please review [the migration guide](https://tauri.app/start/migrate/from-tauri-1/).
|
||||
v1 of `cargo-tauri` is still available as `cargo-tauri_1`, but will be removed in future releases.
|
||||
|
||||
- The nvidia driver no longer defaults to the proprietary driver starting with version 560. You will need to manually set `hardware.nvidia.open` to select the proprietary or open driver.
|
||||
|
||||
- `postgresql` no longer accepts the `enableSystemd` override. Use `systemdSupport` instead.
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
# Release 25.05 ("Warbler”, 2025.05/??) {#sec-release-25.05}
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
||||
## Highlights {#sec-release-25.05-highlights}
|
||||
|
||||
- Create the first release note entry in this section!
|
||||
|
||||
## New Services {#sec-release-25.05-new-services}
|
||||
|
||||
- Create the first release note entry in this section!
|
||||
|
||||
## Backward Incompatibilities {#sec-release-25.05-incompatibilities}
|
||||
|
||||
- Create the first release note entry in this section!
|
||||
|
||||
## Other Notable Changes {#sec-release-25.05-notable-changes}
|
||||
|
||||
- Create the first release note entry in this section!
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
@@ -70,7 +70,7 @@ in
|
||||
defaultChannel = mkOption {
|
||||
internal = true;
|
||||
type = types.str;
|
||||
default = "https://nixos.org/channels/nixos-unstable";
|
||||
default = "https://nixos.org/channels/nixos-24.11";
|
||||
description = "Default NixOS channel to which the root user is subscribed.";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -42,6 +42,7 @@ let
|
||||
VARIANT = optionalString (cfg.variantName != null) cfg.variantName;
|
||||
VARIANT_ID = optionalString (cfg.variant_id != null) cfg.variant_id;
|
||||
DEFAULT_HOSTNAME = config.networking.fqdnOrHostName;
|
||||
SUPPORT_END = "2025-06-30";
|
||||
};
|
||||
|
||||
initrdReleaseContents = (removeAttrs osReleaseContents [ "BUILD_ID" ]) // {
|
||||
|
||||
@@ -0,0 +1,125 @@
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
cfg = config.services.duckdns;
|
||||
duckdns = pkgs.writeShellScriptBin "duckdns" ''
|
||||
DRESPONSE=$(curl -sS --max-time 60 --no-progress-meter -k -K- <<< "url = \"https://www.duckdns.org/update?verbose=true&domains=$DUCKDNS_DOMAINS&token=$DUCKDNS_TOKEN&ip=\"")
|
||||
IPV4=$(echo "$DRESPONSE" | awk 'NR==2')
|
||||
IPV6=$(echo "$DRESPONSE" | awk 'NR==3')
|
||||
RESPONSE=$(echo "$DRESPONSE" | awk 'NR==1')
|
||||
IPCHANGE=$(echo "$DRESPONSE" | awk 'NR==4')
|
||||
|
||||
if [[ "$RESPONSE" = "OK" ]] && [[ "$IPCHANGE" = "UPDATED" ]]; then
|
||||
if [[ "$IPV4" != "" ]] && [[ "$IPV6" == "" ]]; then
|
||||
echo "Your IP was updated at $(date) to IPv4: $IPV4"
|
||||
elif [[ "$IPV4" == "" ]] && [[ "$IPV6" != "" ]]; then
|
||||
echo "Your IP was updated at $(date) to IPv6: $IPV6"
|
||||
else
|
||||
echo "Your IP was updated at $(date) to IPv4: $IPV4 & IPv6 to: $IPV6"
|
||||
fi
|
||||
elif [[ "$RESPONSE" = "OK" ]] && [[ "$IPCHANGE" = "NOCHANGE" ]]; then
|
||||
echo "DuckDNS request at $(date) successful. IP(s) unchanged."
|
||||
else
|
||||
echo -e "Something went wrong, please check your settings\nThe response returned was:\n$DRESPONSE\n"
|
||||
exit 1
|
||||
fi
|
||||
'';
|
||||
in
|
||||
{
|
||||
options.services.duckdns = {
|
||||
enable = lib.mkEnableOption "DuckDNS Dynamic DNS Client";
|
||||
tokenFile = lib.mkOption {
|
||||
default = null;
|
||||
type = lib.types.path;
|
||||
description = ''
|
||||
The path to a file containing the token
|
||||
used to authenticate with DuckDNS.
|
||||
'';
|
||||
};
|
||||
|
||||
domains = lib.mkOption {
|
||||
default = null;
|
||||
type = lib.types.nullOr (lib.types.listOf lib.types.str);
|
||||
example = [ "examplehost" ];
|
||||
description = ''
|
||||
The domain(s) to update in DuckDNS
|
||||
(without the .duckdns.org suffix)
|
||||
'';
|
||||
};
|
||||
|
||||
domainsFile = lib.mkOption {
|
||||
default = null;
|
||||
type = lib.types.nullOr lib.types.path;
|
||||
example = lib.literalExpression ''
|
||||
pkgs.writeText "duckdns-domains.txt" '''
|
||||
examplehost
|
||||
examplehost2
|
||||
examplehost3
|
||||
'''
|
||||
'';
|
||||
description = ''
|
||||
The path to a file containing a
|
||||
newline-separated list of DuckDNS
|
||||
domain(s) to be updated
|
||||
(without the .duckdns.org suffix)
|
||||
'';
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
assertions = [
|
||||
{
|
||||
assertion = cfg.domains != null || cfg.domainsFile != null;
|
||||
message = "Either services.duckdns.domains or services.duckdns.domainsFile has to be defined";
|
||||
}
|
||||
{
|
||||
assertion = !(cfg.domains != null && cfg.domainsFile != null);
|
||||
message = "services.duckdns.domains and services.duckdns.domainsFile can't both be defined at the same time";
|
||||
}
|
||||
{
|
||||
assertion = (cfg.tokenFile != null);
|
||||
message = "services.duckdns.tokenFile has to be defined";
|
||||
}
|
||||
];
|
||||
|
||||
environment.systemPackages = [ duckdns ];
|
||||
|
||||
systemd.services.duckdns = {
|
||||
description = "DuckDNS Dynamic DNS Client";
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
startAt = "*:0/5";
|
||||
path = [
|
||||
pkgs.gnused
|
||||
pkgs.systemd
|
||||
pkgs.curl
|
||||
pkgs.gawk
|
||||
duckdns
|
||||
];
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
LoadCredential = [
|
||||
"DUCKDNS_TOKEN_FILE:${cfg.tokenFile}"
|
||||
] ++ lib.optionals (cfg.domainsFile != null) [ "DUCKDNS_DOMAINS_FILE:${cfg.domainsFile}" ];
|
||||
DynamicUser = true;
|
||||
};
|
||||
script = ''
|
||||
export DUCKDNS_TOKEN=$(systemd-creds cat DUCKDNS_TOKEN_FILE)
|
||||
${lib.optionalString (cfg.domains != null) ''
|
||||
export DUCKDNS_DOMAINS='${lib.strings.concatStringsSep "," cfg.domains}'
|
||||
''}
|
||||
${lib.optionalString (cfg.domainsFile != null) ''
|
||||
export DUCKDNS_DOMAINS=$(systemd-creds cat DUCKDNS_DOMAINS_FILE | sed -z 's/\n/,/g')
|
||||
''}
|
||||
exec ${lib.getExe duckdns}
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
meta.maintainers = with lib.maintainers; [ notthebee ];
|
||||
}
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
with import ../lib;
|
||||
|
||||
{ nixpkgs ? { outPath = cleanSource ./..; revCount = 130979; shortRev = "gfedcba"; }
|
||||
{ nixpkgs ? { outPath = cleanSource ./..; revCount = 708350; shortRev = "1d95cb5"; }
|
||||
, stableBranch ? false
|
||||
, supportedSystems ? [ "x86_64-linux" "aarch64-linux" ]
|
||||
, configuration ? {}
|
||||
@@ -12,7 +12,7 @@ let
|
||||
|
||||
version = fileContents ../.version;
|
||||
versionSuffix =
|
||||
(if stableBranch then "." else "pre") + "${toString nixpkgs.revCount}.${nixpkgs.shortRev}";
|
||||
(if stableBranch then "." else "beta") + "${toString nixpkgs.revCount}.${nixpkgs.shortRev}";
|
||||
|
||||
# Run the tests for each platform. You can run a test by doing
|
||||
# e.g. ‘nix-build release.nix -A tests.login.x86_64-linux’,
|
||||
|
||||
@@ -4,4 +4,5 @@
|
||||
{
|
||||
mit = import ./mit.nix { inherit system pkgs; };
|
||||
heimdal = import ./heimdal.nix { inherit system pkgs; };
|
||||
ldap = import ./ldap { inherit system pkgs; };
|
||||
}
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
{
|
||||
system ? builtins.currentSystem,
|
||||
pkgs ? import ../../../.. { inherit system; },
|
||||
}:
|
||||
{
|
||||
mit = import ./mit.nix { inherit system pkgs; };
|
||||
}
|
||||
@@ -0,0 +1,192 @@
|
||||
import ../../make-test-python.nix (
|
||||
{ pkgs, ... }:
|
||||
let
|
||||
DITRoot = "dc=example,dc=com";
|
||||
realm = "EXAMPLE.COM";
|
||||
|
||||
krb5Package = pkgs.krb5.override { withLdap = true; };
|
||||
|
||||
# Password used by Kerberos services to bind to their identities
|
||||
krbSrvPwd = "kerberos_service_password";
|
||||
# Stash file read by Kerberos daemons containing the service password
|
||||
# DO NOT DO THIS IN PRODUCTION! The stash file is a fundamental secret!
|
||||
krbPwdStash = pkgs.runCommand "krb-pwd-stash" { } ''
|
||||
for srv in cn=kadmin,${DITRoot} cn=kdc,${DITRoot}
|
||||
do
|
||||
echo -e "${krbSrvPwd}\n${krbSrvPwd}" | \
|
||||
${krb5Package}/bin/kdb5_ldap_util -r ${realm} stashsrvpw -f $out $srv 2>&1 > /dev/null
|
||||
done
|
||||
'';
|
||||
|
||||
# The LDAP schema for Kerberos 5 objects is part of the source distribution of Kerberos 5
|
||||
krbLdapSchema = pkgs.runCommand "krb-ldap-schema" { } ''
|
||||
tar -Oxf ${krb5Package.src} \
|
||||
${krb5Package.sourceRoot}/plugins/kdb/ldap/libkdb_ldap/kerberos.openldap.ldif > $out
|
||||
'';
|
||||
|
||||
# Initial LDAP tree containing only the Kerberos services
|
||||
ldapDIT = ''
|
||||
dn: ${DITRoot}
|
||||
objectClass: organization
|
||||
objectClass: dcObject
|
||||
dc: example
|
||||
o: Example Company
|
||||
|
||||
dn: cn=kdc,${DITRoot}
|
||||
objectClass: krbKdcService
|
||||
objectClass: simpleSecurityObject
|
||||
cn: kdc
|
||||
userPassword: ${krbSrvPwd}
|
||||
|
||||
dn: cn=kadmin,${DITRoot}
|
||||
objectClass: krbAdmService
|
||||
objectClass: simpleSecurityObject
|
||||
cn: kadmin
|
||||
userPassword: ${krbSrvPwd}
|
||||
'';
|
||||
|
||||
rootDnPwd = "ldap_root_password";
|
||||
in
|
||||
{
|
||||
name = "kerberos_server-mit-ldap";
|
||||
|
||||
nodes.machine =
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
|
||||
services.openldap = {
|
||||
enable = true;
|
||||
urlList = [
|
||||
"ldapi:///"
|
||||
"ldap://"
|
||||
];
|
||||
declarativeContents."${DITRoot}" = ldapDIT;
|
||||
settings = {
|
||||
children = {
|
||||
"cn=schema".includes = [
|
||||
"${pkgs.openldap}/etc/schema/core.ldif"
|
||||
"${pkgs.openldap}/etc/schema/cosine.ldif"
|
||||
"${pkgs.openldap}/etc/schema/inetorgperson.ldif"
|
||||
"${pkgs.openldap}/etc/schema/nis.ldif"
|
||||
"${krbLdapSchema}"
|
||||
];
|
||||
"olcDatabase={0}config" = {
|
||||
attrs = {
|
||||
objectClass = [ "olcDatabaseConfig" ];
|
||||
olcDatabase = "{0}config";
|
||||
};
|
||||
};
|
||||
"olcDatabase={1}mdb" = {
|
||||
attrs = {
|
||||
objectClass = [
|
||||
"olcDatabaseConfig"
|
||||
"olcMdbConfig"
|
||||
];
|
||||
olcDatabase = "{1}mdb";
|
||||
olcDbDirectory = "/var/lib/openldap/db";
|
||||
olcSuffix = DITRoot;
|
||||
olcRootDN = "cn=root,${DITRoot}";
|
||||
olcRootPW = rootDnPwd;
|
||||
# A tiny but realistic ACL
|
||||
olcAccess = [
|
||||
''
|
||||
to attrs=userPassword
|
||||
by anonymous auth
|
||||
by * none''
|
||||
''
|
||||
to dn.subtree="cn=${realm},cn=realms,${DITRoot}"
|
||||
by dn.exact="cn=kdc,${DITRoot}" write
|
||||
by dn.exact="cn=kadmin,${DITRoot}" write
|
||||
by * none''
|
||||
''
|
||||
to *
|
||||
by * read''
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
services.kerberos_server = {
|
||||
enable = true;
|
||||
settings = {
|
||||
libdefaults.default_realm = realm;
|
||||
realms = {
|
||||
"${realm}" = {
|
||||
acl = [
|
||||
{
|
||||
principal = "admin";
|
||||
access = "all";
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
dbmodules = {
|
||||
"${realm}" = {
|
||||
db_library = "kldap";
|
||||
ldap_kerberos_container_dn = "cn=realms,${DITRoot}";
|
||||
ldap_kdc_dn = "cn=kdc,${DITRoot}";
|
||||
ldap_kadmind_dn = "cn=kadmin,${DITRoot}";
|
||||
ldap_service_password_file = toString krbPwdStash;
|
||||
ldap_servers = "ldapi:///";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
security.krb5 = {
|
||||
enable = true;
|
||||
package = krb5Package;
|
||||
settings = {
|
||||
libdefaults = {
|
||||
default_realm = realm;
|
||||
};
|
||||
realms = {
|
||||
"${realm}" = {
|
||||
admin_server = "machine";
|
||||
kdc = "machine";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
users.extraUsers.alice = {
|
||||
isNormalUser = true;
|
||||
};
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
machine.wait_for_unit("openldap.service")
|
||||
|
||||
with subtest("realm container initialization"):
|
||||
machine.succeed(
|
||||
# Passing a master key directly avoids the need for a separate master key stash file
|
||||
"kdb5_ldap_util -D cn=root,${DITRoot} create -w ${rootDnPwd} -s -P master_key",
|
||||
)
|
||||
|
||||
# These units are bound to fail, as they are started before the directory service is ready
|
||||
machine.execute("systemctl restart kadmind.service kdc.service")
|
||||
|
||||
with subtest("service bind"):
|
||||
for unit in ["kadmind", "kdc"]:
|
||||
machine.wait_for_unit(f"{unit}.service")
|
||||
|
||||
with subtest("administration principal initialization"):
|
||||
machine.succeed("kadmin.local add_principal -pw admin_pw admin")
|
||||
|
||||
with subtest("user principal creation and kinit"):
|
||||
machine.succeed(
|
||||
"kadmin -p admin -w admin_pw addprinc -pw alice_pw alice",
|
||||
"echo alice_pw | sudo -u alice kinit",
|
||||
)
|
||||
# Make extra sure that the user principal actually exists in the directory
|
||||
machine.succeed(
|
||||
"ldapsearch -x -D cn=root,${DITRoot} -w ${rootDnPwd} \
|
||||
-b ${DITRoot} 'krbPrincipalName=alice@${realm}' | grep 'numEntries: 1'"
|
||||
)
|
||||
'';
|
||||
|
||||
meta.maintainers = [ pkgs.lib.maintainers.nessdoor ];
|
||||
}
|
||||
)
|
||||
@@ -11,10 +11,10 @@
|
||||
"clion": {
|
||||
"update-channel": "CLion RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz",
|
||||
"version": "2024.2.2",
|
||||
"sha256": "1658fb15d41dfb804ab0ea3ed4781d4ae0f41d25cc9df17c3f536a565423aa5b",
|
||||
"url": "https://download.jetbrains.com/cpp/CLion-2024.2.2.tar.gz",
|
||||
"build_number": "242.22855.75"
|
||||
"version": "2024.2.3",
|
||||
"sha256": "0afb6e32fe1ceb77ddd07ca7fa7d01a0a5e73a0df42ec58183f9c1a06b84446e",
|
||||
"url": "https://download.jetbrains.com/cpp/CLion-2024.2.3.tar.gz",
|
||||
"build_number": "242.23726.125"
|
||||
},
|
||||
"datagrip": {
|
||||
"update-channel": "DataGrip RELEASE",
|
||||
@@ -108,34 +108,34 @@
|
||||
"ruby-mine": {
|
||||
"update-channel": "RubyMine RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz",
|
||||
"version": "2024.2.3",
|
||||
"sha256": "54991cb37fd6495ad52a1b2b6bc1d6d7ab4fff20a1bd393cab72ac57ca4e31a5",
|
||||
"url": "https://download.jetbrains.com/ruby/RubyMine-2024.2.3.tar.gz",
|
||||
"build_number": "242.23339.18"
|
||||
"version": "2024.2.4",
|
||||
"sha256": "20638d9ac06d840b3bbd5782de4230735380a3b42844ca8fc22af6b2f33f3c58",
|
||||
"url": "https://download.jetbrains.com/ruby/RubyMine-2024.2.4.tar.gz",
|
||||
"build_number": "242.23726.97"
|
||||
},
|
||||
"rust-rover": {
|
||||
"update-channel": "RustRover RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz",
|
||||
"version": "2024.2.4",
|
||||
"sha256": "e8ba0dd398c5ec426128640ffc7eb94728b8f13cd33874712da0c04efa02286c",
|
||||
"url": "https://download.jetbrains.com/rustrover/RustRover-2024.2.4.tar.gz",
|
||||
"build_number": "242.23726.110"
|
||||
"version": "2024.2.5",
|
||||
"sha256": "b3ce4f354d4fdbee8dff5d8120db098502f7393fbebe25891f8bd76e51736b69",
|
||||
"url": "https://download.jetbrains.com/rustrover/RustRover-2024.2.5.tar.gz",
|
||||
"build_number": "242.23726.162"
|
||||
},
|
||||
"webstorm": {
|
||||
"update-channel": "WebStorm RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz",
|
||||
"version": "2024.2.4",
|
||||
"sha256": "c7cd4f9c5affc7f2d24e50130d5565165cc88ac3a4f7fbefd9986a03727f753e",
|
||||
"url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.4.tar.gz",
|
||||
"build_number": "242.23726.96"
|
||||
"version": "2024.3",
|
||||
"sha256": "23858c20f84a10f3be6ac05cdb03a47e6862fabbf4a748ecef7902f882a9e935",
|
||||
"url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3.tar.gz",
|
||||
"build_number": "243.21565.180"
|
||||
},
|
||||
"writerside": {
|
||||
"update-channel": "Writerside EAP",
|
||||
"url-template": "https://download.jetbrains.com/writerside/writerside-{version}.tar.gz",
|
||||
"version": "2024.2 EAP",
|
||||
"sha256": "89d1f4bda404bb81c315600f6b673f89e2798066f68b661a904c9e30db45b4e8",
|
||||
"url": "https://download.jetbrains.com/writerside/writerside-242.21870.138.tar.gz",
|
||||
"build_number": "242.21870.138"
|
||||
"version": "2024.3 EAP",
|
||||
"sha256": "651491afd8a42431045b8d6af13954c001aa45f59f905481b1b3b821f140b60b",
|
||||
"url": "https://download.jetbrains.com/writerside/writerside-243.21565.432.tar.gz",
|
||||
"build_number": "243.21565.432"
|
||||
}
|
||||
},
|
||||
"aarch64-linux": {
|
||||
@@ -150,10 +150,10 @@
|
||||
"clion": {
|
||||
"update-channel": "CLion RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz",
|
||||
"version": "2024.2.2",
|
||||
"sha256": "35e089b8d8bf5f32c80022f394fe525b8aa37540d26c27e861db0df9e34716a4",
|
||||
"url": "https://download.jetbrains.com/cpp/CLion-2024.2.2-aarch64.tar.gz",
|
||||
"build_number": "242.22855.75"
|
||||
"version": "2024.2.3",
|
||||
"sha256": "be3e6f0d490517c8f6e7c7ac248ab8e8823bf19c8102e7695725f80df6c11d63",
|
||||
"url": "https://download.jetbrains.com/cpp/CLion-2024.2.3-aarch64.tar.gz",
|
||||
"build_number": "242.23726.125"
|
||||
},
|
||||
"datagrip": {
|
||||
"update-channel": "DataGrip RELEASE",
|
||||
@@ -247,34 +247,34 @@
|
||||
"ruby-mine": {
|
||||
"update-channel": "RubyMine RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.tar.gz",
|
||||
"version": "2024.2.3",
|
||||
"sha256": "2be5fa28bd5313b9a043818207b9f76f3f38513ec400dfd76b01b543ff8013cf",
|
||||
"url": "https://download.jetbrains.com/ruby/RubyMine-2024.2.3-aarch64.tar.gz",
|
||||
"build_number": "242.23339.18"
|
||||
"version": "2024.2.4",
|
||||
"sha256": "2d08c9b203db20f4d0f78ddd2a1c6a861a78659045a38e9868d060588f3c3cd3",
|
||||
"url": "https://download.jetbrains.com/ruby/RubyMine-2024.2.4-aarch64.tar.gz",
|
||||
"build_number": "242.23726.97"
|
||||
},
|
||||
"rust-rover": {
|
||||
"update-channel": "RustRover RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz",
|
||||
"version": "2024.2.4",
|
||||
"sha256": "d0ca0cd4e6023fd4494c5f50f07acc35809721ef04b82735a367526d0d4ffc5e",
|
||||
"url": "https://download.jetbrains.com/rustrover/RustRover-2024.2.4-aarch64.tar.gz",
|
||||
"build_number": "242.23726.110"
|
||||
"version": "2024.2.5",
|
||||
"sha256": "b208af1d63ccdf6411916c087a08830b947fd6d63d86c2b6ceee7394f5538383",
|
||||
"url": "https://download.jetbrains.com/rustrover/RustRover-2024.2.5-aarch64.tar.gz",
|
||||
"build_number": "242.23726.162"
|
||||
},
|
||||
"webstorm": {
|
||||
"update-channel": "WebStorm RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz",
|
||||
"version": "2024.2.4",
|
||||
"sha256": "80b64046d1eab7f1487110095fdcbb4b1bb2543f900e3a7ab7badcf2f7c17c96",
|
||||
"url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.4-aarch64.tar.gz",
|
||||
"build_number": "242.23726.96"
|
||||
"version": "2024.3",
|
||||
"sha256": "85541c9e8209d7b99422ea2bd1c3b3c14b680f7c5a92cd37f9476c41bfb3c0eb",
|
||||
"url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3-aarch64.tar.gz",
|
||||
"build_number": "243.21565.180"
|
||||
},
|
||||
"writerside": {
|
||||
"update-channel": "Writerside EAP",
|
||||
"url-template": "https://download.jetbrains.com/writerside/writerside-{version}-aarch64.tar.gz",
|
||||
"version": "2024.2 EAP",
|
||||
"sha256": "28a7504a29ba573632e300fbe845d3b2fe3f2c689a853abf83e32ae161e476da",
|
||||
"url": "https://download.jetbrains.com/writerside/writerside-242.21870.138-aarch64.tar.gz",
|
||||
"build_number": "242.21870.138"
|
||||
"version": "2024.3 EAP",
|
||||
"sha256": "c745b284f057bd150b19f773fdfbb4f54922040faaa01293538f51ede9802e35",
|
||||
"url": "https://download.jetbrains.com/writerside/writerside-243.21565.432-aarch64.tar.gz",
|
||||
"build_number": "243.21565.432"
|
||||
}
|
||||
},
|
||||
"x86_64-darwin": {
|
||||
@@ -289,10 +289,10 @@
|
||||
"clion": {
|
||||
"update-channel": "CLion RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg",
|
||||
"version": "2024.2.2",
|
||||
"sha256": "35e1a0348353bc8c741c2dea429d0554c7d2a201e9c69b3bfc11c67accab2c52",
|
||||
"url": "https://download.jetbrains.com/cpp/CLion-2024.2.2.dmg",
|
||||
"build_number": "242.22855.75"
|
||||
"version": "2024.2.3",
|
||||
"sha256": "0dfc4d50268e58bb6b3c42c270ea8cca638a8733a5e2e010447cc74d585895e8",
|
||||
"url": "https://download.jetbrains.com/cpp/CLion-2024.2.3.dmg",
|
||||
"build_number": "242.23726.125"
|
||||
},
|
||||
"datagrip": {
|
||||
"update-channel": "DataGrip RELEASE",
|
||||
@@ -386,34 +386,34 @@
|
||||
"ruby-mine": {
|
||||
"update-channel": "RubyMine RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg",
|
||||
"version": "2024.2.3",
|
||||
"sha256": "abb6c51d39c3132f60f0f5d8fd5038f908247c0c029b34ef63821ef2fc79b7fa",
|
||||
"url": "https://download.jetbrains.com/ruby/RubyMine-2024.2.3.dmg",
|
||||
"build_number": "242.23339.18"
|
||||
"version": "2024.2.4",
|
||||
"sha256": "b3eec9db897a46c4becb5e1cd123d47879a2547632d11ec8c04e946182b74ccf",
|
||||
"url": "https://download.jetbrains.com/ruby/RubyMine-2024.2.4.dmg",
|
||||
"build_number": "242.23726.97"
|
||||
},
|
||||
"rust-rover": {
|
||||
"update-channel": "RustRover RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg",
|
||||
"version": "2024.2.4",
|
||||
"sha256": "1f14c203ef186339a5305008ce2112275a6b293ce422b355bba0e8554b9656e2",
|
||||
"url": "https://download.jetbrains.com/rustrover/RustRover-2024.2.4.dmg",
|
||||
"build_number": "242.23726.110"
|
||||
"version": "2024.2.5",
|
||||
"sha256": "906bc85ada746fd8e783c4fa524458f6cedde7c77499728da8ccae050201a400",
|
||||
"url": "https://download.jetbrains.com/rustrover/RustRover-2024.2.5.dmg",
|
||||
"build_number": "242.23726.162"
|
||||
},
|
||||
"webstorm": {
|
||||
"update-channel": "WebStorm RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg",
|
||||
"version": "2024.2.4",
|
||||
"sha256": "63ebaffb17bcbe8759fbe256a7764aea3feadf18ac817a27f80b8cfed1af62d1",
|
||||
"url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.4.dmg",
|
||||
"build_number": "242.23726.96"
|
||||
"version": "2024.3",
|
||||
"sha256": "fccac67e93d69ad98a36b0b8c092913fbc8bfc06b1cb7ee3932bad4394f78c78",
|
||||
"url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3.dmg",
|
||||
"build_number": "243.21565.180"
|
||||
},
|
||||
"writerside": {
|
||||
"update-channel": "Writerside EAP",
|
||||
"url-template": "https://download.jetbrains.com/writerside/writerside-{version}.dmg",
|
||||
"version": "2024.2 EAP",
|
||||
"sha256": "bcf989440a220fff70600d38333bc99feef0453779e60caae0d05d1168cfffb0",
|
||||
"url": "https://download.jetbrains.com/writerside/writerside-242.21870.138.dmg",
|
||||
"build_number": "242.21870.138"
|
||||
"version": "2024.3 EAP",
|
||||
"sha256": "5a44fc83964514916c52b9cd49fa13e3f16757474a84dca85af7c6d97c2ede4b",
|
||||
"url": "https://download.jetbrains.com/writerside/writerside-243.21565.432.dmg",
|
||||
"build_number": "243.21565.432"
|
||||
}
|
||||
},
|
||||
"aarch64-darwin": {
|
||||
@@ -428,10 +428,10 @@
|
||||
"clion": {
|
||||
"update-channel": "CLion RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg",
|
||||
"version": "2024.2.2",
|
||||
"sha256": "428d557d4b5eb7687c7c8142b61591ef4fe7825891d91616019292280696180e",
|
||||
"url": "https://download.jetbrains.com/cpp/CLion-2024.2.2-aarch64.dmg",
|
||||
"build_number": "242.22855.75"
|
||||
"version": "2024.2.3",
|
||||
"sha256": "998d629381e6f596b8e0cf5289fe8ca7cfd3221fc73b6c8548d768889b14196f",
|
||||
"url": "https://download.jetbrains.com/cpp/CLion-2024.2.3-aarch64.dmg",
|
||||
"build_number": "242.23726.125"
|
||||
},
|
||||
"datagrip": {
|
||||
"update-channel": "DataGrip RELEASE",
|
||||
@@ -525,34 +525,34 @@
|
||||
"ruby-mine": {
|
||||
"update-channel": "RubyMine RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg",
|
||||
"version": "2024.2.3",
|
||||
"sha256": "79ac4f9fb54f7049c2bb5ab3ec78280fe4991e3aaa4cc608cb06ce980c76a05a",
|
||||
"url": "https://download.jetbrains.com/ruby/RubyMine-2024.2.3-aarch64.dmg",
|
||||
"build_number": "242.23339.18"
|
||||
"version": "2024.2.4",
|
||||
"sha256": "4ccaff57fe8605962797313b3dcea2b4f373249bbaa9e56f242acacbd88d5635",
|
||||
"url": "https://download.jetbrains.com/ruby/RubyMine-2024.2.4-aarch64.dmg",
|
||||
"build_number": "242.23726.97"
|
||||
},
|
||||
"rust-rover": {
|
||||
"update-channel": "RustRover RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg",
|
||||
"version": "2024.2.4",
|
||||
"sha256": "3bdde43216bd21fcb93483dd9026ea15859e3e5a8d3d14c6e59526b734ebed69",
|
||||
"url": "https://download.jetbrains.com/rustrover/RustRover-2024.2.4-aarch64.dmg",
|
||||
"build_number": "242.23726.110"
|
||||
"version": "2024.2.5",
|
||||
"sha256": "f0ccd53e5cd8a0a143db956fbc6d118d3771bc42c62b846e9d396a620bea79d1",
|
||||
"url": "https://download.jetbrains.com/rustrover/RustRover-2024.2.5-aarch64.dmg",
|
||||
"build_number": "242.23726.162"
|
||||
},
|
||||
"webstorm": {
|
||||
"update-channel": "WebStorm RELEASE",
|
||||
"url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg",
|
||||
"version": "2024.2.4",
|
||||
"sha256": "38c75389c1948e9a1343ad54e050483966a6eae1a4b862dc1d1bbe8e580de5f4",
|
||||
"url": "https://download.jetbrains.com/webstorm/WebStorm-2024.2.4-aarch64.dmg",
|
||||
"build_number": "242.23726.96"
|
||||
"version": "2024.3",
|
||||
"sha256": "b3fed87c00746694419b0da71baf71ebb10a8c3803c5a1502c689ff9ce7831f4",
|
||||
"url": "https://download.jetbrains.com/webstorm/WebStorm-2024.3-aarch64.dmg",
|
||||
"build_number": "243.21565.180"
|
||||
},
|
||||
"writerside": {
|
||||
"update-channel": "Writerside EAP",
|
||||
"url-template": "https://download.jetbrains.com/writerside/writerside-{version}-aarch64.dmg",
|
||||
"version": "2024.2 EAP",
|
||||
"sha256": "cb815cfe2fa9fd69675a31cb870ccf5037ac429a954cb950141074668f250014",
|
||||
"url": "https://download.jetbrains.com/writerside/writerside-242.21870.138-aarch64.dmg",
|
||||
"build_number": "242.21870.138"
|
||||
"version": "2024.3 EAP",
|
||||
"sha256": "04996f17dfb4a840c74270266efc4dad9b78fa498fb9016109d1b58b498791b5",
|
||||
"url": "https://download.jetbrains.com/writerside/writerside-243.21565.432-aarch64.dmg",
|
||||
"build_number": "243.21565.432"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,15 +19,15 @@
|
||||
"builds": {
|
||||
"241.19072.1155": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
|
||||
"242.21829.162": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
|
||||
"242.22855.75": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
|
||||
"242.23339.18": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
|
||||
"242.23339.24": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
|
||||
"242.23726.100": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
|
||||
"242.23726.102": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
|
||||
"242.23726.103": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
|
||||
"242.23726.107": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
|
||||
"242.23726.110": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
|
||||
"242.23726.96": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip"
|
||||
"242.23726.125": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
|
||||
"242.23726.162": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
|
||||
"242.23726.97": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip",
|
||||
"243.21565.180": "https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip"
|
||||
},
|
||||
"name": "ideavim"
|
||||
},
|
||||
@@ -69,15 +69,15 @@
|
||||
"builds": {
|
||||
"241.19072.1155": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
|
||||
"242.21829.162": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
|
||||
"242.22855.75": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
|
||||
"242.23339.18": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
|
||||
"242.23339.24": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
|
||||
"242.23726.100": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
|
||||
"242.23726.102": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
|
||||
"242.23726.103": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
|
||||
"242.23726.107": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
|
||||
"242.23726.110": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
|
||||
"242.23726.96": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip"
|
||||
"242.23726.125": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
|
||||
"242.23726.162": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
|
||||
"242.23726.97": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip",
|
||||
"243.21565.180": "https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip"
|
||||
},
|
||||
"name": "string-manipulation"
|
||||
},
|
||||
@@ -100,15 +100,15 @@
|
||||
"builds": {
|
||||
"241.19072.1155": null,
|
||||
"242.21829.162": null,
|
||||
"242.22855.75": null,
|
||||
"242.23339.18": null,
|
||||
"242.23339.24": null,
|
||||
"242.23726.100": null,
|
||||
"242.23726.102": null,
|
||||
"242.23726.103": null,
|
||||
"242.23726.107": null,
|
||||
"242.23726.110": null,
|
||||
"242.23726.96": null
|
||||
"242.23726.125": null,
|
||||
"242.23726.162": null,
|
||||
"242.23726.97": null,
|
||||
"243.21565.180": null
|
||||
},
|
||||
"name": "kotlin"
|
||||
},
|
||||
@@ -131,15 +131,15 @@
|
||||
"builds": {
|
||||
"241.19072.1155": null,
|
||||
"242.21829.162": null,
|
||||
"242.22855.75": null,
|
||||
"242.23339.18": "https://plugins.jetbrains.com/files/6981/609355/ini-242.23339.18.zip",
|
||||
"242.23339.24": "https://plugins.jetbrains.com/files/6981/609355/ini-242.23339.18.zip",
|
||||
"242.23339.24": null,
|
||||
"242.23726.100": "https://plugins.jetbrains.com/files/6981/623497/ini-242.23726.110.zip",
|
||||
"242.23726.102": "https://plugins.jetbrains.com/files/6981/623497/ini-242.23726.110.zip",
|
||||
"242.23726.103": "https://plugins.jetbrains.com/files/6981/623497/ini-242.23726.110.zip",
|
||||
"242.23726.107": "https://plugins.jetbrains.com/files/6981/623497/ini-242.23726.110.zip",
|
||||
"242.23726.110": "https://plugins.jetbrains.com/files/6981/623497/ini-242.23726.110.zip",
|
||||
"242.23726.96": "https://plugins.jetbrains.com/files/6981/623497/ini-242.23726.110.zip"
|
||||
"242.23726.125": "https://plugins.jetbrains.com/files/6981/623497/ini-242.23726.110.zip",
|
||||
"242.23726.162": "https://plugins.jetbrains.com/files/6981/623497/ini-242.23726.110.zip",
|
||||
"242.23726.97": "https://plugins.jetbrains.com/files/6981/623497/ini-242.23726.110.zip",
|
||||
"243.21565.180": "https://plugins.jetbrains.com/files/6981/632272/ini-243.21565.180.zip"
|
||||
},
|
||||
"name": "ini"
|
||||
},
|
||||
@@ -162,15 +162,15 @@
|
||||
"builds": {
|
||||
"241.19072.1155": "https://plugins.jetbrains.com/files/7086/610924/AceJump.zip",
|
||||
"242.21829.162": "https://plugins.jetbrains.com/files/7086/610924/AceJump.zip",
|
||||
"242.22855.75": "https://plugins.jetbrains.com/files/7086/610924/AceJump.zip",
|
||||
"242.23339.18": "https://plugins.jetbrains.com/files/7086/610924/AceJump.zip",
|
||||
"242.23339.24": "https://plugins.jetbrains.com/files/7086/610924/AceJump.zip",
|
||||
"242.23726.100": "https://plugins.jetbrains.com/files/7086/610924/AceJump.zip",
|
||||
"242.23726.102": "https://plugins.jetbrains.com/files/7086/610924/AceJump.zip",
|
||||
"242.23726.103": "https://plugins.jetbrains.com/files/7086/610924/AceJump.zip",
|
||||
"242.23726.107": "https://plugins.jetbrains.com/files/7086/610924/AceJump.zip",
|
||||
"242.23726.110": "https://plugins.jetbrains.com/files/7086/610924/AceJump.zip",
|
||||
"242.23726.96": "https://plugins.jetbrains.com/files/7086/610924/AceJump.zip"
|
||||
"242.23726.125": "https://plugins.jetbrains.com/files/7086/610924/AceJump.zip",
|
||||
"242.23726.162": "https://plugins.jetbrains.com/files/7086/610924/AceJump.zip",
|
||||
"242.23726.97": "https://plugins.jetbrains.com/files/7086/610924/AceJump.zip",
|
||||
"243.21565.180": "https://plugins.jetbrains.com/files/7086/518678/AceJump.zip"
|
||||
},
|
||||
"name": "acejump"
|
||||
},
|
||||
@@ -191,8 +191,8 @@
|
||||
"phpstorm"
|
||||
],
|
||||
"builds": {
|
||||
"242.23726.103": "https://plugins.jetbrains.com/files/7320/619870/PHP_Annotations-11.1.0.zip",
|
||||
"242.23726.107": "https://plugins.jetbrains.com/files/7320/619870/PHP_Annotations-11.1.0.zip"
|
||||
"242.23726.103": "https://plugins.jetbrains.com/files/7320/630497/PHP_Annotations-11.1.1.zip",
|
||||
"242.23726.107": "https://plugins.jetbrains.com/files/7320/630497/PHP_Annotations-11.1.1.zip"
|
||||
},
|
||||
"name": "php-annotations"
|
||||
},
|
||||
@@ -210,13 +210,13 @@
|
||||
],
|
||||
"builds": {
|
||||
"242.21829.162": "https://plugins.jetbrains.com/files/7322/595111/python-ce-242.21829.142.zip",
|
||||
"242.22855.75": "https://plugins.jetbrains.com/files/7322/605059/python-ce-242.22855.74.zip",
|
||||
"242.23339.24": "https://plugins.jetbrains.com/files/7322/608478/python-ce-242.23339.11.zip",
|
||||
"242.23726.100": "https://plugins.jetbrains.com/files/7322/622853/python-ce-242.23726.103.zip",
|
||||
"242.23726.102": "https://plugins.jetbrains.com/files/7322/622853/python-ce-242.23726.103.zip",
|
||||
"242.23726.103": "https://plugins.jetbrains.com/files/7322/622853/python-ce-242.23726.103.zip",
|
||||
"242.23726.110": "https://plugins.jetbrains.com/files/7322/622853/python-ce-242.23726.103.zip",
|
||||
"242.23726.96": "https://plugins.jetbrains.com/files/7322/622853/python-ce-242.23726.103.zip"
|
||||
"242.23726.125": "https://plugins.jetbrains.com/files/7322/622853/python-ce-242.23726.103.zip",
|
||||
"242.23726.162": "https://plugins.jetbrains.com/files/7322/622853/python-ce-242.23726.103.zip",
|
||||
"243.21565.180": "https://plugins.jetbrains.com/files/7322/630160/python-ce-243.21565.129.zip"
|
||||
},
|
||||
"name": "python-community-edition"
|
||||
},
|
||||
@@ -238,16 +238,16 @@
|
||||
],
|
||||
"builds": {
|
||||
"241.19072.1155": "https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip",
|
||||
"242.21829.162": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip",
|
||||
"242.22855.75": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip",
|
||||
"242.23339.18": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip",
|
||||
"242.23339.24": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip",
|
||||
"242.23726.100": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip",
|
||||
"242.23726.102": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip",
|
||||
"242.23726.103": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip",
|
||||
"242.23726.107": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip",
|
||||
"242.23726.110": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip",
|
||||
"242.23726.96": "https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip"
|
||||
"242.21829.162": "https://plugins.jetbrains.com/files/7391/625836/asciidoctor-intellij-plugin-0.43.2.zip",
|
||||
"242.23339.24": "https://plugins.jetbrains.com/files/7391/625836/asciidoctor-intellij-plugin-0.43.2.zip",
|
||||
"242.23726.100": "https://plugins.jetbrains.com/files/7391/625836/asciidoctor-intellij-plugin-0.43.2.zip",
|
||||
"242.23726.102": "https://plugins.jetbrains.com/files/7391/625836/asciidoctor-intellij-plugin-0.43.2.zip",
|
||||
"242.23726.103": "https://plugins.jetbrains.com/files/7391/625836/asciidoctor-intellij-plugin-0.43.2.zip",
|
||||
"242.23726.107": "https://plugins.jetbrains.com/files/7391/625836/asciidoctor-intellij-plugin-0.43.2.zip",
|
||||
"242.23726.125": "https://plugins.jetbrains.com/files/7391/625836/asciidoctor-intellij-plugin-0.43.2.zip",
|
||||
"242.23726.162": "https://plugins.jetbrains.com/files/7391/625836/asciidoctor-intellij-plugin-0.43.2.zip",
|
||||
"242.23726.97": "https://plugins.jetbrains.com/files/7391/625836/asciidoctor-intellij-plugin-0.43.2.zip",
|
||||
"243.21565.180": "https://plugins.jetbrains.com/files/7391/625836/asciidoctor-intellij-plugin-0.43.2.zip"
|
||||
},
|
||||
"name": "asciidoc"
|
||||
},
|
||||
@@ -269,14 +269,14 @@
|
||||
"builds": {
|
||||
"241.19072.1155": null,
|
||||
"242.21829.162": null,
|
||||
"242.22855.75": null,
|
||||
"242.23339.18": null,
|
||||
"242.23339.24": null,
|
||||
"242.23726.100": null,
|
||||
"242.23726.102": null,
|
||||
"242.23726.103": null,
|
||||
"242.23726.107": null,
|
||||
"242.23726.96": null
|
||||
"242.23726.125": null,
|
||||
"242.23726.97": null,
|
||||
"243.21565.180": null
|
||||
},
|
||||
"name": "-deprecated-rust"
|
||||
},
|
||||
@@ -298,14 +298,14 @@
|
||||
"builds": {
|
||||
"241.19072.1155": null,
|
||||
"242.21829.162": null,
|
||||
"242.22855.75": null,
|
||||
"242.23339.18": null,
|
||||
"242.23339.24": null,
|
||||
"242.23726.100": null,
|
||||
"242.23726.102": null,
|
||||
"242.23726.103": null,
|
||||
"242.23726.107": null,
|
||||
"242.23726.96": null
|
||||
"242.23726.125": null,
|
||||
"242.23726.97": null,
|
||||
"243.21565.180": null
|
||||
},
|
||||
"name": "-deprecated-rust-beta"
|
||||
},
|
||||
@@ -319,10 +319,10 @@
|
||||
"ruby-mine"
|
||||
],
|
||||
"builds": {
|
||||
"242.23339.18": "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip",
|
||||
"242.23339.24": "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip",
|
||||
"242.23726.102": "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip",
|
||||
"242.23726.103": "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip"
|
||||
"242.23726.103": "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip",
|
||||
"242.23726.97": "https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip"
|
||||
},
|
||||
"name": "ide-features-trainer"
|
||||
},
|
||||
@@ -345,15 +345,15 @@
|
||||
"builds": {
|
||||
"241.19072.1155": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
|
||||
"242.21829.162": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
|
||||
"242.22855.75": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
|
||||
"242.23339.18": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
|
||||
"242.23339.24": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
|
||||
"242.23726.100": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
|
||||
"242.23726.102": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
|
||||
"242.23726.103": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
|
||||
"242.23726.107": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
|
||||
"242.23726.110": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
|
||||
"242.23726.96": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip"
|
||||
"242.23726.125": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
|
||||
"242.23726.162": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
|
||||
"242.23726.97": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip",
|
||||
"243.21565.180": "https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip"
|
||||
},
|
||||
"name": "nixidea"
|
||||
},
|
||||
@@ -387,15 +387,15 @@
|
||||
"builds": {
|
||||
"241.19072.1155": "https://plugins.jetbrains.com/files/10037/585243/CSVEditor-3.4.0-241.zip",
|
||||
"242.21829.162": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip",
|
||||
"242.22855.75": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip",
|
||||
"242.23339.18": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip",
|
||||
"242.23339.24": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip",
|
||||
"242.23726.100": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip",
|
||||
"242.23726.102": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip",
|
||||
"242.23726.103": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip",
|
||||
"242.23726.107": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip",
|
||||
"242.23726.110": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip",
|
||||
"242.23726.96": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip"
|
||||
"242.23726.125": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip",
|
||||
"242.23726.162": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip",
|
||||
"242.23726.97": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip",
|
||||
"243.21565.180": "https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip"
|
||||
},
|
||||
"name": "csv-editor"
|
||||
},
|
||||
@@ -416,17 +416,17 @@
|
||||
"webstorm"
|
||||
],
|
||||
"builds": {
|
||||
"241.19072.1155": "https://plugins.jetbrains.com/files/11349/622098/aws-toolkit-jetbrains-standalone-3.34-241.zip",
|
||||
"242.21829.162": "https://plugins.jetbrains.com/files/11349/622102/aws-toolkit-jetbrains-standalone-3.34-242.zip",
|
||||
"242.22855.75": "https://plugins.jetbrains.com/files/11349/622102/aws-toolkit-jetbrains-standalone-3.34-242.zip",
|
||||
"242.23339.18": "https://plugins.jetbrains.com/files/11349/622102/aws-toolkit-jetbrains-standalone-3.34-242.zip",
|
||||
"242.23339.24": "https://plugins.jetbrains.com/files/11349/622102/aws-toolkit-jetbrains-standalone-3.34-242.zip",
|
||||
"242.23726.100": "https://plugins.jetbrains.com/files/11349/622102/aws-toolkit-jetbrains-standalone-3.34-242.zip",
|
||||
"242.23726.102": "https://plugins.jetbrains.com/files/11349/622102/aws-toolkit-jetbrains-standalone-3.34-242.zip",
|
||||
"242.23726.103": "https://plugins.jetbrains.com/files/11349/622102/aws-toolkit-jetbrains-standalone-3.34-242.zip",
|
||||
"242.23726.107": "https://plugins.jetbrains.com/files/11349/622102/aws-toolkit-jetbrains-standalone-3.34-242.zip",
|
||||
"242.23726.110": "https://plugins.jetbrains.com/files/11349/622102/aws-toolkit-jetbrains-standalone-3.34-242.zip",
|
||||
"242.23726.96": "https://plugins.jetbrains.com/files/11349/622102/aws-toolkit-jetbrains-standalone-3.34-242.zip"
|
||||
"241.19072.1155": "https://plugins.jetbrains.com/files/11349/632694/aws-toolkit-jetbrains-standalone-3.39-241.zip",
|
||||
"242.21829.162": "https://plugins.jetbrains.com/files/11349/632698/aws-toolkit-jetbrains-standalone-3.39-242.zip",
|
||||
"242.23339.24": "https://plugins.jetbrains.com/files/11349/632698/aws-toolkit-jetbrains-standalone-3.39-242.zip",
|
||||
"242.23726.100": "https://plugins.jetbrains.com/files/11349/632698/aws-toolkit-jetbrains-standalone-3.39-242.zip",
|
||||
"242.23726.102": "https://plugins.jetbrains.com/files/11349/632698/aws-toolkit-jetbrains-standalone-3.39-242.zip",
|
||||
"242.23726.103": "https://plugins.jetbrains.com/files/11349/632698/aws-toolkit-jetbrains-standalone-3.39-242.zip",
|
||||
"242.23726.107": "https://plugins.jetbrains.com/files/11349/632698/aws-toolkit-jetbrains-standalone-3.39-242.zip",
|
||||
"242.23726.125": "https://plugins.jetbrains.com/files/11349/632698/aws-toolkit-jetbrains-standalone-3.39-242.zip",
|
||||
"242.23726.162": "https://plugins.jetbrains.com/files/11349/632698/aws-toolkit-jetbrains-standalone-3.39-242.zip",
|
||||
"242.23726.97": "https://plugins.jetbrains.com/files/11349/632698/aws-toolkit-jetbrains-standalone-3.39-242.zip",
|
||||
"243.21565.180": "https://plugins.jetbrains.com/files/11349/632696/aws-toolkit-jetbrains-standalone-3.39-243.zip"
|
||||
},
|
||||
"name": "aws-toolkit"
|
||||
},
|
||||
@@ -447,17 +447,17 @@
|
||||
"webstorm"
|
||||
],
|
||||
"builds": {
|
||||
"241.19072.1155": "https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip",
|
||||
"241.19072.1155": null,
|
||||
"242.21829.162": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip",
|
||||
"242.22855.75": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip",
|
||||
"242.23339.18": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip",
|
||||
"242.23339.24": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip",
|
||||
"242.23726.100": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip",
|
||||
"242.23726.102": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip",
|
||||
"242.23726.103": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip",
|
||||
"242.23726.107": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip",
|
||||
"242.23726.110": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip",
|
||||
"242.23726.96": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip"
|
||||
"242.23726.125": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip",
|
||||
"242.23726.162": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip",
|
||||
"242.23726.97": "https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip",
|
||||
"243.21565.180": "https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip"
|
||||
},
|
||||
"name": "vscode-keymap"
|
||||
},
|
||||
@@ -480,15 +480,15 @@
|
||||
"builds": {
|
||||
"241.19072.1155": "https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip",
|
||||
"242.21829.162": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip",
|
||||
"242.22855.75": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip",
|
||||
"242.23339.18": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip",
|
||||
"242.23339.24": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip",
|
||||
"242.23726.100": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip",
|
||||
"242.23726.102": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip",
|
||||
"242.23726.103": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip",
|
||||
"242.23726.107": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip",
|
||||
"242.23726.110": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip",
|
||||
"242.23726.96": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip"
|
||||
"242.23726.125": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip",
|
||||
"242.23726.162": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip",
|
||||
"242.23726.97": "https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip",
|
||||
"243.21565.180": "https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip"
|
||||
},
|
||||
"name": "eclipse-keymap"
|
||||
},
|
||||
@@ -509,17 +509,17 @@
|
||||
"webstorm"
|
||||
],
|
||||
"builds": {
|
||||
"241.19072.1155": "https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip",
|
||||
"241.19072.1155": null,
|
||||
"242.21829.162": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip",
|
||||
"242.22855.75": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip",
|
||||
"242.23339.18": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip",
|
||||
"242.23339.24": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip",
|
||||
"242.23726.100": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip",
|
||||
"242.23726.102": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip",
|
||||
"242.23726.103": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip",
|
||||
"242.23726.107": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip",
|
||||
"242.23726.110": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip",
|
||||
"242.23726.96": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip"
|
||||
"242.23726.125": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip",
|
||||
"242.23726.162": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip",
|
||||
"242.23726.97": "https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip",
|
||||
"243.21565.180": "https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip"
|
||||
},
|
||||
"name": "visual-studio-keymap"
|
||||
},
|
||||
@@ -542,15 +542,15 @@
|
||||
"builds": {
|
||||
"241.19072.1155": null,
|
||||
"242.21829.162": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip",
|
||||
"242.22855.75": "https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip",
|
||||
"242.23339.18": "https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip",
|
||||
"242.23339.24": "https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip",
|
||||
"242.23726.100": "https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip",
|
||||
"242.23726.102": "https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip",
|
||||
"242.23726.103": "https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip",
|
||||
"242.23726.107": "https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip",
|
||||
"242.23726.110": "https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip",
|
||||
"242.23726.96": "https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip"
|
||||
"242.23726.125": "https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip",
|
||||
"242.23726.162": "https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip",
|
||||
"242.23726.97": "https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip",
|
||||
"243.21565.180": "https://plugins.jetbrains.com/files/14004/629971/protoeditor-243.21565.122.zip"
|
||||
},
|
||||
"name": "protocol-buffers"
|
||||
},
|
||||
@@ -573,15 +573,15 @@
|
||||
"builds": {
|
||||
"241.19072.1155": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"242.21829.162": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"242.22855.75": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"242.23339.18": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"242.23339.24": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"242.23726.100": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"242.23726.102": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"242.23726.103": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"242.23726.107": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"242.23726.110": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"242.23726.96": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar"
|
||||
"242.23726.125": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"242.23726.162": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"242.23726.97": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"243.21565.180": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar"
|
||||
},
|
||||
"name": "darcula-pitch-black"
|
||||
},
|
||||
@@ -602,19 +602,19 @@
|
||||
"webstorm"
|
||||
],
|
||||
"builds": {
|
||||
"241.19072.1155": "https://plugins.jetbrains.com/files/17718/623947/github-copilot-intellij-1.5.27.7265.zip",
|
||||
"242.21829.162": "https://plugins.jetbrains.com/files/17718/623947/github-copilot-intellij-1.5.27.7265.zip",
|
||||
"242.22855.75": "https://plugins.jetbrains.com/files/17718/623947/github-copilot-intellij-1.5.27.7265.zip",
|
||||
"242.23339.18": "https://plugins.jetbrains.com/files/17718/623947/github-copilot-intellij-1.5.27.7265.zip",
|
||||
"242.23339.24": "https://plugins.jetbrains.com/files/17718/623947/github-copilot-intellij-1.5.27.7265.zip",
|
||||
"242.23726.100": "https://plugins.jetbrains.com/files/17718/623947/github-copilot-intellij-1.5.27.7265.zip",
|
||||
"242.23726.102": "https://plugins.jetbrains.com/files/17718/623947/github-copilot-intellij-1.5.27.7265.zip",
|
||||
"242.23726.103": "https://plugins.jetbrains.com/files/17718/623947/github-copilot-intellij-1.5.27.7265.zip",
|
||||
"242.23726.107": "https://plugins.jetbrains.com/files/17718/623947/github-copilot-intellij-1.5.27.7265.zip",
|
||||
"242.23726.110": "https://plugins.jetbrains.com/files/17718/623947/github-copilot-intellij-1.5.27.7265.zip",
|
||||
"242.23726.96": "https://plugins.jetbrains.com/files/17718/623947/github-copilot-intellij-1.5.27.7265.zip"
|
||||
"241.19072.1155": "https://plugins.jetbrains.com/files/17718/631741/github-copilot-intellij-1.5.29.7524.zip",
|
||||
"242.21829.162": "https://plugins.jetbrains.com/files/17718/631741/github-copilot-intellij-1.5.29.7524.zip",
|
||||
"242.23339.24": "https://plugins.jetbrains.com/files/17718/631741/github-copilot-intellij-1.5.29.7524.zip",
|
||||
"242.23726.100": "https://plugins.jetbrains.com/files/17718/631741/github-copilot-intellij-1.5.29.7524.zip",
|
||||
"242.23726.102": "https://plugins.jetbrains.com/files/17718/631741/github-copilot-intellij-1.5.29.7524.zip",
|
||||
"242.23726.103": "https://plugins.jetbrains.com/files/17718/631741/github-copilot-intellij-1.5.29.7524.zip",
|
||||
"242.23726.107": "https://plugins.jetbrains.com/files/17718/631741/github-copilot-intellij-1.5.29.7524.zip",
|
||||
"242.23726.125": "https://plugins.jetbrains.com/files/17718/631741/github-copilot-intellij-1.5.29.7524.zip",
|
||||
"242.23726.162": "https://plugins.jetbrains.com/files/17718/631741/github-copilot-intellij-1.5.29.7524.zip",
|
||||
"242.23726.97": "https://plugins.jetbrains.com/files/17718/631741/github-copilot-intellij-1.5.29.7524.zip",
|
||||
"243.21565.180": "https://plugins.jetbrains.com/files/17718/631741/github-copilot-intellij-1.5.29.7524.zip"
|
||||
},
|
||||
"name": "github-copilot"
|
||||
"name": "github-copilot-intellij"
|
||||
},
|
||||
"18444": {
|
||||
"compatible": [
|
||||
@@ -635,15 +635,15 @@
|
||||
"builds": {
|
||||
"241.19072.1155": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"242.21829.162": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"242.22855.75": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"242.23339.18": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"242.23339.24": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"242.23726.100": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"242.23726.102": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"242.23726.103": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"242.23726.107": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"242.23726.110": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"242.23726.96": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip"
|
||||
"242.23726.125": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"242.23726.162": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"242.23726.97": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"243.21565.180": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip"
|
||||
},
|
||||
"name": "netbeans-6-5-keymap"
|
||||
},
|
||||
@@ -666,15 +666,15 @@
|
||||
"builds": {
|
||||
"241.19072.1155": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
|
||||
"242.21829.162": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
|
||||
"242.22855.75": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
|
||||
"242.23339.18": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
|
||||
"242.23339.24": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
|
||||
"242.23726.100": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
|
||||
"242.23726.102": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
|
||||
"242.23726.103": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
|
||||
"242.23726.107": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
|
||||
"242.23726.110": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
|
||||
"242.23726.96": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip"
|
||||
"242.23726.125": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
|
||||
"242.23726.162": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
|
||||
"242.23726.97": "https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip",
|
||||
"243.21565.180": null
|
||||
},
|
||||
"name": "mermaid"
|
||||
},
|
||||
@@ -685,9 +685,9 @@
|
||||
"rust-rover"
|
||||
],
|
||||
"builds": {
|
||||
"242.22855.75": "https://plugins.jetbrains.com/files/22407/623488/intellij-rust-242.23726.110.zip",
|
||||
"242.23726.103": "https://plugins.jetbrains.com/files/22407/623488/intellij-rust-242.23726.110.zip",
|
||||
"242.23726.110": "https://plugins.jetbrains.com/files/22407/623488/intellij-rust-242.23726.110.zip"
|
||||
"242.23726.103": "https://plugins.jetbrains.com/files/22407/629692/intellij-rust-242.23726.162.zip",
|
||||
"242.23726.125": "https://plugins.jetbrains.com/files/22407/629692/intellij-rust-242.23726.162.zip",
|
||||
"242.23726.162": "https://plugins.jetbrains.com/files/22407/629692/intellij-rust-242.23726.162.zip"
|
||||
},
|
||||
"name": "rust"
|
||||
}
|
||||
@@ -695,36 +695,40 @@
|
||||
"files": {
|
||||
"https://plugins.jetbrains.com/files/10037/585243/CSVEditor-3.4.0-241.zip": "sha256-QwguD4ENrL7GxmX+CGEyCPowbAPNpYgntVGAbHxOlyQ=",
|
||||
"https://plugins.jetbrains.com/files/10037/614791/intellij-csv-validator-4.0.0.zip": "sha256-DuztEfLOmwSWrWk+Q9rWYn/BzHrkx2giKTTpIbZdAOQ=",
|
||||
"https://plugins.jetbrains.com/files/11349/622098/aws-toolkit-jetbrains-standalone-3.34-241.zip": "sha256-Q9Wi/ngotmka1fHorAQCTk3u7lXU7IMbBlCDZyzcFLA=",
|
||||
"https://plugins.jetbrains.com/files/11349/622102/aws-toolkit-jetbrains-standalone-3.34-242.zip": "sha256-XgnQFwzWoxyO3Rk31oZgMxSHVzynoZIanuAlg4ZnaIE=",
|
||||
"https://plugins.jetbrains.com/files/12062/508223/keymap-vscode-241.14494.150.zip": "sha256-LeQ5vi9PCJYmWNmT/sutWjSlwZaAYYuEljVJBYG2VpY=",
|
||||
"https://plugins.jetbrains.com/files/11349/632694/aws-toolkit-jetbrains-standalone-3.39-241.zip": "sha256-It4hm8A0RA8mWAPvAsz06V6zAmePVDxCDJwKFiFXXuo=",
|
||||
"https://plugins.jetbrains.com/files/11349/632696/aws-toolkit-jetbrains-standalone-3.39-243.zip": "sha256-p+vbtqaIvaVOLQl5bCdwDe6UveObY9D3qdGmWEQ69TM=",
|
||||
"https://plugins.jetbrains.com/files/11349/632698/aws-toolkit-jetbrains-standalone-3.39-242.zip": "sha256-DpgF0bayWT6hu3vlwsTXEGPNRQPgKWhyx16u0J/X8Jc=",
|
||||
"https://plugins.jetbrains.com/files/12062/586741/keymap-vscode-242.20224.385.zip": "sha256-LpooujwYaX339yZJVe7HPYIOw+YdJLeEtRgwPxLJ9eI=",
|
||||
"https://plugins.jetbrains.com/files/12062/630060/keymap-vscode-243.21565.122.zip": "sha256-phv8MTGKNGzRviKzX+nIVTbkX4WkU82QVO5zXUQLtAo=",
|
||||
"https://plugins.jetbrains.com/files/12559/508216/keymap-eclipse-241.14494.150.zip": "sha256-/hEx0gIFvUXD799tRmMHAt9Z5ziFgaQs1RX0zQwTJIA=",
|
||||
"https://plugins.jetbrains.com/files/12559/579737/keymap-eclipse-242.20224.204.zip": "sha256-bAN0ifNiUqj51TYc7RLKwTMtv9OxjzqEQwXa6KtFlsU=",
|
||||
"https://plugins.jetbrains.com/files/13017/508253/keymap-visualStudio-241.14494.150.zip": "sha256-tNgt0vIkdCB/LcaSj58mT6cNlw4lytRo0cZSt7sIERU=",
|
||||
"https://plugins.jetbrains.com/files/12559/629985/keymap-eclipse-243.21565.122.zip": "sha256-/g1ucT18ywVJnCePH7WyMWKgM9umowBz5wFObmO7cws=",
|
||||
"https://plugins.jetbrains.com/files/13017/591092/keymap-visualStudio-242.21829.44.zip": "sha256-aIwiMT30L3KCvbrkMUdgDdUdyBqGmT4w6c4pZEnMGNo=",
|
||||
"https://plugins.jetbrains.com/files/13017/630016/keymap-visualStudio-243.21565.122.zip": "sha256-VQqK0Cm9ddXN63KYIqimuGOh7EB9VvdlErp/VrWx8SA=",
|
||||
"https://plugins.jetbrains.com/files/1347/623989/scala-intellij-bin-2024.2.29.zip": "sha256-mgR+H69cpaXwF1z/HiWYFYzukcvEE2cPVZ6bP3TjHTk=",
|
||||
"https://plugins.jetbrains.com/files/14004/587347/protoeditor-242.21829.3.zip": "sha256-Y6xplTjA9bmhwLS9clcu/4znltSgDsga8Na5BmOWX5E=",
|
||||
"https://plugins.jetbrains.com/files/14004/608477/protoeditor-242.23339.11.zip": "sha256-gI3sY4jDXsY6pUhzqejJnvGJwLj6bNMs45UR8ekrZcs=",
|
||||
"https://plugins.jetbrains.com/files/14004/629971/protoeditor-243.21565.122.zip": "sha256-cv6JTujoD5g90ngXTtnj5x31wjbIZlKZ6Zn0H+vHCTk=",
|
||||
"https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=",
|
||||
"https://plugins.jetbrains.com/files/164/590339/IdeaVIM-2.16.0.zip": "sha256-uMIrYoZE16X/K96HuDJx8QMh6wUbi4+qSw+HJAq7ukI=",
|
||||
"https://plugins.jetbrains.com/files/17718/623947/github-copilot-intellij-1.5.27.7265.zip": "sha256-BxoQXtnDFm8a/8bN6Ow309K7UlDXJ23fTN4017x3VEo=",
|
||||
"https://plugins.jetbrains.com/files/17718/631741/github-copilot-intellij-1.5.29.7524.zip": "sha256-ljVGVi/i36EnLxzK7IVGiKVF8EyQTeNVCVKBtGlYNmg=",
|
||||
"https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=",
|
||||
"https://plugins.jetbrains.com/files/20146/537545/Mermaid-0.0.22_IJ.232.zip": "sha256-DUiIQYIzYoXmgtBakSLtMB+xxJMaR70Jgg9erySa3wQ=",
|
||||
"https://plugins.jetbrains.com/files/2162/542984/StringManipulation-9.14.1.zip": "sha256-OqeQCqFe8iW/8NPg+9i+UKh+twIPQ9uLZrItMukCi7k=",
|
||||
"https://plugins.jetbrains.com/files/22407/623488/intellij-rust-242.23726.110.zip": "sha256-faN4knSIL9qR31zRBKt1TmxJFNBDtdGiViFJj+rLnRw=",
|
||||
"https://plugins.jetbrains.com/files/22407/629692/intellij-rust-242.23726.162.zip": "sha256-QLh4Im0+rQqwk9nUVDv3HSRgMMqR7hwtN2CMaUNT2Go=",
|
||||
"https://plugins.jetbrains.com/files/631/622862/python-242.23726.103.zip": "sha256-rLGDVLj+HBe3EFzuwCNkHvVPaqT3z7qZnCil0kAO75I=",
|
||||
"https://plugins.jetbrains.com/files/6981/609355/ini-242.23339.18.zip": "sha256-WucgAKBoKxnZvRfN2g8in8LjOOKAtECEN0sGcz28j4c=",
|
||||
"https://plugins.jetbrains.com/files/6981/623497/ini-242.23726.110.zip": "sha256-gSbiV74fQNU0xOkcK5BHozmy9Msslkhx9APH0JY74J8=",
|
||||
"https://plugins.jetbrains.com/files/6981/632272/ini-243.21565.180.zip": "sha256-OV1hRCKODSnv6hcv5YaFkOwwpljhFVdOBoe12PH6cT4=",
|
||||
"https://plugins.jetbrains.com/files/7086/518678/AceJump.zip": "sha256-kVUEgfEKUupV/qlB4Dpzi5pFHjhVvX74XIPetKtjysM=",
|
||||
"https://plugins.jetbrains.com/files/7086/610924/AceJump.zip": "sha256-Qp24juITBXEF5izdzayWq28Ioy4/kgT0qz6snZ0dND0=",
|
||||
"https://plugins.jetbrains.com/files/7219/605730/Symfony_Plugin-2024.1.276.zip": "sha256-drNmhJMe+kuY2fcHjY+SQmkACvFk0rVI4vAhyZ/bgLc=",
|
||||
"https://plugins.jetbrains.com/files/7320/619870/PHP_Annotations-11.1.0.zip": "sha256-jvK3J3NwUrOO7+izYM/SagnqJGAUHa9yGFCcZvkPfrA=",
|
||||
"https://plugins.jetbrains.com/files/7320/630497/PHP_Annotations-11.1.1.zip": "sha256-05aBYbqNIuwe/JTwntFdIqML8NHbTOwVusl1P9FzuYY=",
|
||||
"https://plugins.jetbrains.com/files/7322/595111/python-ce-242.21829.142.zip": "sha256-DwQNhbNO1zk75lcf35spNnzo0u103UAhXignhO+grek=",
|
||||
"https://plugins.jetbrains.com/files/7322/605059/python-ce-242.22855.74.zip": "sha256-As1MgvssBg+45DLRtNbirT5HyXPcabzt3ulKYBIiWj8=",
|
||||
"https://plugins.jetbrains.com/files/7322/608478/python-ce-242.23339.11.zip": "sha256-tWsshZfm5czxBtF4ZfPHzi843Oztx2i0JEHcpnlLcSo=",
|
||||
"https://plugins.jetbrains.com/files/7322/622853/python-ce-242.23726.103.zip": "sha256-mHh0o6RN1Ey1dq+9yEDBCrE3CuF9Hx7fpmxUzPlWtlA=",
|
||||
"https://plugins.jetbrains.com/files/7322/630160/python-ce-243.21565.129.zip": "sha256-d6YzBt753DNMdfPsZ7kFTIwgUbmXaVG5F7esY8BaGtA=",
|
||||
"https://plugins.jetbrains.com/files/7391/561441/asciidoctor-intellij-plugin-0.42.2.zip": "sha256-oKczkLHAk2bJRNRgToVe0ySEJGF8+P4oWqQ33olwzWw=",
|
||||
"https://plugins.jetbrains.com/files/7391/591338/asciidoctor-intellij-plugin-0.43.1.zip": "sha256-AGP8YY6NG/hy7xIDoiJy3GZHRB9stVNYYoHtqOmYCx0=",
|
||||
"https://plugins.jetbrains.com/files/7391/625836/asciidoctor-intellij-plugin-0.43.2.zip": "sha256-O5eLrj01zxW9b8GYkJMLZjmWLAq5nbWljGDrEal4AjA=",
|
||||
"https://plugins.jetbrains.com/files/8554/588322/featuresTrainer-242.21829.14.zip": "sha256-pL+j0K6U0DZibnmcIE6kY9Kj/+5g8akuHeuppuZiEII=",
|
||||
"https://plugins.jetbrains.com/files/8607/606922/NixIDEA-0.4.0.16.zip": "sha256-9GMqs/hSavcw1E4ZJTLDH1lx3HEeQ5NR8BT+Q9pN3io=",
|
||||
"https://plugins.jetbrains.com/files/9568/608453/go-plugin-242.23339.11.zip": "sha256-eEZw5q0+IHlf1Re3M6RwZOF7AXMn99a7n4nF54x5yew=",
|
||||
|
||||
@@ -2470,7 +2470,10 @@ in
|
||||
});
|
||||
|
||||
vim-dadbod-ui = super.vim-dadbod-ui.overrideAttrs {
|
||||
dependencies = with self; [ vim-dadbod ];
|
||||
dependencies = [ self.vim-dadbod ];
|
||||
|
||||
doInstallCheck = true;
|
||||
vimCommandCheck = "DBUI";
|
||||
};
|
||||
|
||||
vim-dasht = super.vim-dasht.overrideAttrs {
|
||||
|
||||
@@ -1,23 +1,33 @@
|
||||
{ lib
|
||||
, mkDerivation
|
||||
, cmake
|
||||
, extra-cmake-modules
|
||||
, applet-window-buttons
|
||||
, karchive
|
||||
, kcoreaddons
|
||||
, ki18n
|
||||
, kio
|
||||
, kirigami2
|
||||
, mauikit
|
||||
, mauikit-filebrowsing
|
||||
, mauikit-imagetools
|
||||
, qtmultimedia
|
||||
, qtquickcontrols2
|
||||
, qtlocation
|
||||
, exiv2
|
||||
, kquickimageedit
|
||||
{
|
||||
lib,
|
||||
mkDerivation,
|
||||
cmake,
|
||||
extra-cmake-modules,
|
||||
applet-window-buttons,
|
||||
karchive,
|
||||
kcoreaddons,
|
||||
ki18n,
|
||||
kio,
|
||||
kirigami2,
|
||||
mauikit,
|
||||
mauikit-filebrowsing,
|
||||
mauikit-imagetools,
|
||||
qtmultimedia,
|
||||
qtquickcontrols2,
|
||||
qtlocation,
|
||||
exiv2,
|
||||
kquickimageedit,
|
||||
fetchFromGitHub,
|
||||
}:
|
||||
|
||||
let
|
||||
src-kdtree = fetchFromGitHub {
|
||||
owner = "cdalitz";
|
||||
repo = "kdtree-cpp";
|
||||
rev = "refs/tags/v1.3";
|
||||
hash = "sha256-h3cmndvjMlp/MTk/Ve3R183BLrE7VbL7GQx8YkOHEgU=";
|
||||
};
|
||||
in
|
||||
mkDerivation {
|
||||
pname = "pix";
|
||||
|
||||
@@ -26,6 +36,18 @@ mkDerivation {
|
||||
extra-cmake-modules
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
cp ${src-kdtree}/kdtree.cpp src/
|
||||
substituteInPlace src/CMakeLists.txt \
|
||||
--replace-fail "main.cpp" "main.cpp kdtree.cpp"
|
||||
'';
|
||||
|
||||
env = {
|
||||
NIX_CFLAGS_COMPILE = toString [
|
||||
"-I${src-kdtree}"
|
||||
];
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
applet-window-buttons
|
||||
karchive
|
||||
@@ -43,11 +65,11 @@ mkDerivation {
|
||||
kquickimageedit
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Image gallery application";
|
||||
mainProgram = "pix";
|
||||
homepage = "https://invent.kde.org/maui/pix";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ onny ];
|
||||
license = lib.licenses.gpl3Plus;
|
||||
maintainers = with lib.maintainers; [ onny ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "helm-diff";
|
||||
version = "3.9.11";
|
||||
version = "3.9.12";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "databus23";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-DwZZi7A6/UsKiFJSgMdo/zqlsRFz9RkFy8+s8RTumXg=";
|
||||
hash = "sha256-fHL5YlqDS4taQNgqgYYttq/6Q5kQhp/hvtqMRCKPt70=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-3TtUpwg8HLHp/fILH5/qBnMKFmBlALOGSSYoEg3s1h0=";
|
||||
vendorHash = "sha256-7amqt5FIgnDtaybyur3t01BuuQXPdFptDBfqhX6jPIE=";
|
||||
|
||||
ldflags = [ "-s" "-w" "-X github.com/databus23/helm-diff/v3/cmd.Version=${version}" ];
|
||||
|
||||
|
||||
@@ -180,13 +180,13 @@
|
||||
"vendorHash": "sha256-oDMKf39uNMO9/kyiZ1IuZlj2yIF1q5Z3wewxEBh3yso="
|
||||
},
|
||||
"bitwarden": {
|
||||
"hash": "sha256-9YYaZmMFR47drh4dg/Zl85VWWBwAEYzMga6WHY2UgPU=",
|
||||
"hash": "sha256-quiSqpXdqsGCt7ANc2WlFBygUzNIYWstP6Iq6OfLXJw=",
|
||||
"homepage": "https://registry.terraform.io/providers/maxlaverse/bitwarden",
|
||||
"owner": "maxlaverse",
|
||||
"repo": "terraform-provider-bitwarden",
|
||||
"rev": "v0.10.0",
|
||||
"rev": "v0.12.0",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-TRrVtJdI0ZqBfuIr947cQJh+o663CHOCScAcYDcy048="
|
||||
"vendorHash": "sha256-oORgmuLn2dQzSKba3lXh8zWnk4Z1bdCWPseC2Po1UBA="
|
||||
},
|
||||
"brightbox": {
|
||||
"hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=",
|
||||
@@ -849,13 +849,13 @@
|
||||
"vendorHash": null
|
||||
},
|
||||
"newrelic": {
|
||||
"hash": "sha256-KoBCI48Oq/ooyM0XXs9XcT7HELmdAoeDGEZxRB0kNIs=",
|
||||
"hash": "sha256-H13o42CKAJfiG0eD27RU0TlAKgR7nvHtMzvk6TX/VO8=",
|
||||
"homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
|
||||
"owner": "newrelic",
|
||||
"repo": "terraform-provider-newrelic",
|
||||
"rev": "v3.50.0",
|
||||
"rev": "v3.52.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-yVtWjfXxxaIj0JtTKRtILzJwW7QWnRWTVc0VYb9vfdk="
|
||||
"vendorHash": "sha256-UsekZjrioy2F/OvfrvXMVYlZO3I2NU4B+BOZHwP5YSk="
|
||||
},
|
||||
"nomad": {
|
||||
"hash": "sha256-k61iQ9FQG3nscBp5CE/fFCbHpeLawbUAtGPM+IZtfVc=",
|
||||
|
||||
+2
-2
@@ -2,7 +2,7 @@
|
||||
callPackage ./generic.nix { } rec {
|
||||
pname = "signal-desktop-beta";
|
||||
dir = "Signal Beta";
|
||||
version = "7.33.0-beta.1";
|
||||
version = "7.34.0-beta.2";
|
||||
url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb";
|
||||
hash = "sha256-17ZSdfGS28OqXb0UBbel+tR8UTh07pPQNIoKmuUtzZ0=";
|
||||
hash = "sha256-fwSZ0j2iHJUhRc2MZY5Cj6guoAST3XfrXFnj8uUCl9k=";
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
callPackage ./generic.nix { } rec {
|
||||
pname = "signal-desktop";
|
||||
dir = "Signal";
|
||||
version = "7.32.0";
|
||||
version = "7.33.0";
|
||||
url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";
|
||||
hash = "sha256-3D1Pou+x8mJBzWAKRq8YDcFOJXKKnA8ksMJ3SR8C+SU=";
|
||||
hash = "sha256-/7G3KocmkKBochwjF0iavqeQjXXc9AlFocsERAh8mKs=";
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
buildDotnetModule,
|
||||
cargo-about,
|
||||
cargo-tauri,
|
||||
cargo-tauri_1,
|
||||
dotnetCorePackages,
|
||||
fetchFromGitHub,
|
||||
fetchNpmDeps,
|
||||
@@ -59,7 +59,7 @@ rustPlatform.buildRustPackage {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cargo-about
|
||||
cargo-tauri.hook
|
||||
cargo-tauri_1.hook
|
||||
dotnetSdk
|
||||
nodejs
|
||||
npmHooks.npmConfigHook
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
fetchNpmDeps,
|
||||
gtk3,
|
||||
wrapGAppsHook3,
|
||||
cargo-tauri,
|
||||
cargo-tauri_1,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cargo-tauri.hook
|
||||
cargo-tauri_1.hook
|
||||
nodejs
|
||||
npmHooks.npmConfigHook
|
||||
pkg-config
|
||||
|
||||
Generated
+7328
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,45 @@
|
||||
From 1e792a4e7356f070856e4bf5775a07b18c3cc5ee Mon Sep 17 00:00:00 2001
|
||||
From: jopejoe1 <johannes@joens.email>
|
||||
Date: Sat, 7 Sep 2024 23:28:25 +0200
|
||||
Subject: [PATCH] fix finding libs
|
||||
|
||||
---
|
||||
alvr/server_openvr/build.rs | 18 +++---------------
|
||||
alvr/session/build.rs | 4 +---
|
||||
2 files changed, 4 insertions(+), 18 deletions(-)
|
||||
|
||||
diff --git a/alvr/server_openvr/build.rs b/alvr/server_openvr/build.rs
|
||||
index b9bc4bd8..0581de0d 100644
|
||||
--- a/alvr/server_openvr/build.rs
|
||||
+++ b/alvr/server_openvr/build.rs
|
||||
@@ -1,24 +1,12 @@
|
||||
-use std::{env, path::PathBuf};
|
||||
+use std::{env, path::{Path, PathBuf}};
|
||||
|
||||
fn get_ffmpeg_path() -> PathBuf {
|
||||
- let ffmpeg_path = alvr_filesystem::deps_dir()
|
||||
- .join(if cfg!(target_os = "linux") {
|
||||
- "linux"
|
||||
- } else {
|
||||
- "windows"
|
||||
- })
|
||||
- .join("ffmpeg");
|
||||
-
|
||||
- if cfg!(target_os = "linux") {
|
||||
- ffmpeg_path.join("alvr_build")
|
||||
- } else {
|
||||
- ffmpeg_path
|
||||
- }
|
||||
+ Path::new("@ffmpeg@").to_owned()
|
||||
}
|
||||
|
||||
#[cfg(all(target_os = "linux", feature = "gpl"))]
|
||||
fn get_linux_x264_path() -> PathBuf {
|
||||
- alvr_filesystem::deps_dir().join("linux/x264/alvr_build")
|
||||
+ Path::new("@x264@").to_owned()
|
||||
}
|
||||
|
||||
fn main() {
|
||||
--
|
||||
2.46.0
|
||||
|
||||
@@ -1,34 +1,154 @@
|
||||
{ lib,
|
||||
appimageTools,
|
||||
fetchurl,
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
substituteAll,
|
||||
nix-update-script,
|
||||
pkg-config,
|
||||
autoAddDriverRunpath,
|
||||
alsa-lib,
|
||||
brotli,
|
||||
bzip2,
|
||||
celt,
|
||||
ffmpeg,
|
||||
jack2,
|
||||
lame,
|
||||
libX11,
|
||||
libXi,
|
||||
libXrandr,
|
||||
libXcursor,
|
||||
libdrm,
|
||||
libglvnd,
|
||||
libogg,
|
||||
libpng,
|
||||
libtheora,
|
||||
libunwind,
|
||||
libva,
|
||||
libvdpau,
|
||||
libxkbcommon,
|
||||
openssl,
|
||||
openvr,
|
||||
pipewire,
|
||||
rust-cbindgen,
|
||||
soxr,
|
||||
vulkan-headers,
|
||||
vulkan-loader,
|
||||
wayland,
|
||||
x264,
|
||||
xvidcore,
|
||||
}:
|
||||
let
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "alvr";
|
||||
version = "20.6.1";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/alvr-org/ALVR/releases/download/v${version}/ALVR-x86_64.AppImage";
|
||||
hash = "sha256-IYw3D18xUGWiFu74c4d8d4tohZztAD6mmZCYsDNxR+A=";
|
||||
version = "20.11.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alvr-org";
|
||||
repo = "ALVR";
|
||||
rev = "refs/tags/v${version}";
|
||||
fetchSubmodules = true; #TODO devendor openvr
|
||||
hash = "sha256-zqeh9U0A/KHlRieq9Lf+7f04K3JG/vpE2gZ916ReXLc=";
|
||||
};
|
||||
|
||||
appimageContents = appimageTools.extractType2 { inherit pname version src; };
|
||||
in
|
||||
appimageTools.wrapType2 {
|
||||
inherit pname version src;
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"openxr-0.19.0" = "sha256-bnMSjJh+zjLw4Pdxr7LLm6qYAJOK7hz5xORKZ2pVcGw=";
|
||||
"settings-schema-0.2.0" = "sha256-luEdAKDTq76dMeo5kA+QDTHpRMFUg3n0qvyQ7DkId0k=";
|
||||
};
|
||||
};
|
||||
|
||||
extraInstallCommands = ''
|
||||
install -Dm444 ${appimageContents}/alvr.desktop -t $out/share/applications
|
||||
substituteInPlace $out/share/applications/alvr.desktop \
|
||||
--replace-fail 'Exec=alvr_dashboard' 'Exec=alvr'
|
||||
cp -r ${appimageContents}/usr/share/icons $out/share
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./fix-finding-libs.patch;
|
||||
ffmpeg = lib.getDev ffmpeg;
|
||||
x264 = lib.getDev x264;
|
||||
})
|
||||
];
|
||||
|
||||
env = {
|
||||
NIX_CFLAGS_COMPILE = toString [
|
||||
"-lbrotlicommon"
|
||||
"-lbrotlidec"
|
||||
"-lcrypto"
|
||||
"-lpng"
|
||||
"-lssl"
|
||||
];
|
||||
};
|
||||
|
||||
RUSTFLAGS = map (a: "-C link-arg=${a}") [
|
||||
"-Wl,--push-state,--no-as-needed"
|
||||
"-lEGL"
|
||||
"-lwayland-client"
|
||||
"-lxkbcommon"
|
||||
"-Wl,--pop-state"
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
rust-cbindgen
|
||||
pkg-config
|
||||
rustPlatform.bindgenHook
|
||||
autoAddDriverRunpath
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
alsa-lib
|
||||
brotli
|
||||
bzip2
|
||||
celt
|
||||
ffmpeg
|
||||
jack2
|
||||
lame
|
||||
libX11
|
||||
libXcursor
|
||||
libXi
|
||||
libXrandr
|
||||
libdrm
|
||||
libglvnd
|
||||
libogg
|
||||
libpng
|
||||
libtheora
|
||||
libunwind
|
||||
libva
|
||||
libvdpau
|
||||
libxkbcommon
|
||||
openssl
|
||||
openvr
|
||||
pipewire
|
||||
soxr
|
||||
vulkan-headers
|
||||
vulkan-loader
|
||||
wayland
|
||||
x264
|
||||
xvidcore
|
||||
];
|
||||
|
||||
postBuild = ''
|
||||
# Build SteamVR driver ("streamer")
|
||||
cargo xtask build-streamer --release
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
install -Dm755 ${src}/alvr/xtask/resources/alvr.desktop $out/share/applications/alvr.desktop
|
||||
install -Dm644 ${src}/resources/alvr.png $out/share/icons/hicolor/256x256/apps/alvr.png
|
||||
|
||||
# Install SteamVR driver
|
||||
mkdir -p $out/{libexec,lib/alvr,share}
|
||||
cp -r ./build/alvr_streamer_linux/lib64/. $out/lib
|
||||
cp -r ./build/alvr_streamer_linux/libexec/. $out/libexec
|
||||
cp -r ./build/alvr_streamer_linux/share/. $out/share
|
||||
ln -s $out/lib $out/lib64
|
||||
'';
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
description = "Stream VR games from your PC to your headset via Wi-Fi";
|
||||
homepage = "https://github.com/alvr-org/ALVR/";
|
||||
changelog = "https://github.com/alvr-org/ALVR/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
mainProgram = "alvr";
|
||||
mainProgram = "alvr_dashboard";
|
||||
maintainers = with maintainers; [ passivelemon ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -10,16 +10,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "buf";
|
||||
version = "1.46.0";
|
||||
version = "1.47.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bufbuild";
|
||||
repo = "buf";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-XLVEZYQEq9qXrH7EytoHO3QExOAZX6N57amcKBy5ORE=";
|
||||
hash = "sha256-zPpHdqhL+D7Dd5IL1bTpxfPWY6ascJAcya+8/GeYfzM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-P1MNwpz3UbaQHLFv5mMs9d0xulitfAD90T1jWxVi5/k=";
|
||||
vendorHash = "sha256-dSNmMc7iWtrItFuz341FpYWo5AyExgO7e7Fbib2gCS8=";
|
||||
|
||||
patches = [
|
||||
# Skip a test that requires networking to be available to work.
|
||||
|
||||
Generated
+11659
File diff suppressed because it is too large
Load Diff
@@ -4,55 +4,59 @@
|
||||
callPackage,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
darwin,
|
||||
gtk3,
|
||||
libsoup,
|
||||
cargo-tauri,
|
||||
gtk4,
|
||||
nix-update-script,
|
||||
openssl,
|
||||
pkg-config,
|
||||
webkitgtk_4_0,
|
||||
testers,
|
||||
webkitgtk_4_1,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tauri";
|
||||
version = "1.7.1-unstable-2024-08-16";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tauri-apps";
|
||||
repo = "tauri";
|
||||
rev = "2b61447dfc167ec11724f99671bf9e2de0bf6768";
|
||||
hash = "sha256-gKG7olZuTCkW+SKI3FVZqgS6Pp5hFemRJshdma8rpyg=";
|
||||
rev = "refs/tags/tauri-v${version}";
|
||||
hash = "sha256-n1rSffVef9G9qtLyheuK5k6anAHsZANSu0C73QDdg2o=";
|
||||
};
|
||||
|
||||
# Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at
|
||||
# https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202
|
||||
sourceRoot = "${src.name}/tooling/cli";
|
||||
|
||||
cargoHash = "sha256-VXg/dAhwPTSrLwJm8HNzAi/sVF9RqgpHIF3PZe1LjSA=";
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"schemars_derive-0.8.21" = "sha256-AmxBKZXm2Eb+w8/hLQWTol5f22uP8UqaIh+LVLbS20g=";
|
||||
};
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs =
|
||||
[ openssl ]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
gtk3
|
||||
libsoup
|
||||
webkitgtk_4_0
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin (
|
||||
with darwin.apple_sdk.frameworks;
|
||||
[
|
||||
CoreServices
|
||||
Security
|
||||
SystemConfiguration
|
||||
]
|
||||
);
|
||||
gtk4
|
||||
webkitgtk_4_1
|
||||
];
|
||||
|
||||
cargoBuildFlags = [ "--package tauri-cli" ];
|
||||
cargoTestFlags = cargoBuildFlags;
|
||||
|
||||
passthru = {
|
||||
# See ./doc/hooks/tauri.section.md
|
||||
hook = callPackage ./hook.nix { };
|
||||
|
||||
tests = {
|
||||
setupHooks = callPackage ./test-app.nix { };
|
||||
hook = callPackage ./test-app.nix { };
|
||||
version = testers.testVersion { package = cargo-tauri; };
|
||||
};
|
||||
|
||||
updateScript = nix-update-script {
|
||||
extraArgs = [
|
||||
"--version-regex"
|
||||
"tauri-v(.*)"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -5,50 +5,67 @@
|
||||
cargo-tauri,
|
||||
darwin,
|
||||
glib-networking,
|
||||
libsoup,
|
||||
libayatana-appindicator,
|
||||
nodejs,
|
||||
openssl,
|
||||
pkg-config,
|
||||
webkitgtk_4_0,
|
||||
wrapGAppsHook3,
|
||||
pnpm_9,
|
||||
webkitgtk_4_1,
|
||||
wrapGAppsHook4,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "test-app";
|
||||
inherit (cargo-tauri) version src;
|
||||
|
||||
# Basic example provided by upstream
|
||||
sourceRoot = "${src.name}/examples/workspace";
|
||||
cargoLock = {
|
||||
inherit (cargo-tauri.cargoDeps) lockFile;
|
||||
outputHashes = {
|
||||
"schemars_derive-0.8.21" = "sha256-AmxBKZXm2Eb+w8/hLQWTol5f22uP8UqaIh+LVLbS20g=";
|
||||
};
|
||||
};
|
||||
|
||||
cargoPatches = [
|
||||
# https://github.com/NixOS/nixpkgs/issues/332957
|
||||
./update-time-crate.patch
|
||||
];
|
||||
postPatch = ''
|
||||
substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
|
||||
--replace "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
|
||||
'';
|
||||
|
||||
cargoHash = "sha256-ull9BWzeKsnMi4wcH67FnKFzTjqEdiRlM3f+EKIPvvU=";
|
||||
pnpmDeps = pnpm_9.fetchDeps {
|
||||
inherit
|
||||
pname
|
||||
version
|
||||
src
|
||||
;
|
||||
|
||||
hash = "sha256-kTr61DFPIIYceB8tZrKFaMG65CZ//djGEOQBLRNPotk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cargo-tauri.hook
|
||||
|
||||
nodejs
|
||||
pkg-config
|
||||
wrapGAppsHook3
|
||||
pnpm_9.configHook
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[ openssl ]
|
||||
++ lib.optionals stdenv.isLinux [
|
||||
glib-networking
|
||||
libsoup
|
||||
webkitgtk_4_0
|
||||
libayatana-appindicator
|
||||
webkitgtk_4_1
|
||||
]
|
||||
++ lib.optionals stdenv.isDarwin (
|
||||
with darwin.apple_sdk.frameworks;
|
||||
[
|
||||
AppKit
|
||||
CoreServices
|
||||
Security
|
||||
WebKit
|
||||
]
|
||||
);
|
||||
++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.WebKit
|
||||
];
|
||||
|
||||
buildAndTestSubdir = "examples/api/src-tauri";
|
||||
|
||||
# This example depends on the actual `api` package to be built in-tree
|
||||
preBuild = ''
|
||||
pnpm --filter '@tauri-apps/api' build
|
||||
'';
|
||||
|
||||
# No one should be actually running this, so lets save some time
|
||||
buildType = "debug";
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,62 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
rustPlatform,
|
||||
fetchFromGitHub,
|
||||
cargo-tauri,
|
||||
cargo-tauri_1,
|
||||
gtk3,
|
||||
libsoup,
|
||||
openssl,
|
||||
webkitgtk_4_0,
|
||||
}:
|
||||
|
||||
cargo-tauri.overrideAttrs (
|
||||
newAttrs: oldAttrs: {
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tauri-apps";
|
||||
repo = "tauri";
|
||||
rev = "tauri-v${newAttrs.version}";
|
||||
hash = "sha256-z8dfiLghN6m95PLCMDgpBMNo+YEvvsGN9F101fAcVF4=";
|
||||
};
|
||||
|
||||
# Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at
|
||||
# https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202
|
||||
sourceRoot = "${newAttrs.src.name}/tooling/cli";
|
||||
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit (newAttrs)
|
||||
pname
|
||||
version
|
||||
src
|
||||
sourceRoot
|
||||
;
|
||||
hash = "sha256-OIXC4kwGIemIL8KaqK5SUDZZrOX3PX0w3h9bNiM/pCw=";
|
||||
};
|
||||
|
||||
buildInputs =
|
||||
[ openssl ]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [
|
||||
gtk3
|
||||
libsoup
|
||||
webkitgtk_4_0
|
||||
];
|
||||
|
||||
passthru = {
|
||||
hook = cargo-tauri.hook.override { cargo-tauri = cargo-tauri_1; };
|
||||
};
|
||||
|
||||
meta = {
|
||||
inherit (oldAttrs.meta)
|
||||
description
|
||||
homepage
|
||||
changelog
|
||||
license
|
||||
maintainers
|
||||
mainProgram
|
||||
;
|
||||
};
|
||||
}
|
||||
)
|
||||
@@ -20,13 +20,13 @@ lib.checkListOfEnum "${pname}: color variant" validVariants [ variant ]
|
||||
stdenvNoCC.mkDerivation
|
||||
(finalAttrs: {
|
||||
inherit pname;
|
||||
version = "0-unstable-2024-05-28";
|
||||
version = "0-unstable-2024-10-19";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "catppuccin";
|
||||
repo = "plymouth";
|
||||
rev = "e13c348a0f47772303b2da1e9396027d8cda160d";
|
||||
hash = "sha256-6DliqhRncvdPuKzL9LJec3PJWmK/jo9BrrML7g6YcH0=";
|
||||
rev = "e0f58d6fcf3dbc2d35dfc4fec394217fbfa92666";
|
||||
hash = "sha256-He6ER1QNrJCUthFoBBGHBINouW/tozxQy3R79F5tsuo=";
|
||||
};
|
||||
|
||||
sourceRoot = "${finalAttrs.src.name}/themes/catppuccin-${variant}";
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
darwin,
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
cargo-tauri,
|
||||
cargo-tauri_1,
|
||||
cinny,
|
||||
desktop-file-utils,
|
||||
wrapGAppsHook3,
|
||||
@@ -71,7 +71,7 @@ rustPlatform.buildRustPackage rec {
|
||||
nativeBuildInputs = [
|
||||
wrapGAppsHook3
|
||||
pkg-config
|
||||
cargo-tauri.hook
|
||||
cargo-tauri_1.hook
|
||||
desktop-file-utils
|
||||
];
|
||||
|
||||
|
||||
Generated
+102
-94
@@ -4,18 +4,18 @@ version = 3
|
||||
|
||||
[[package]]
|
||||
name = "addr2line"
|
||||
version = "0.22.0"
|
||||
version = "0.24.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
|
||||
checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
|
||||
dependencies = [
|
||||
"gimli",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "adler"
|
||||
version = "1.0.2"
|
||||
name = "adler2"
|
||||
version = "2.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
|
||||
checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
|
||||
|
||||
[[package]]
|
||||
name = "aho-corasick"
|
||||
@@ -87,17 +87,17 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "backtrace"
|
||||
version = "0.3.73"
|
||||
version = "0.3.74"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
|
||||
checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
|
||||
dependencies = [
|
||||
"addr2line",
|
||||
"cc",
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"miniz_oxide",
|
||||
"object",
|
||||
"rustc-demangle",
|
||||
"windows-targets 0.52.6",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -108,15 +108,18 @@ checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
|
||||
|
||||
[[package]]
|
||||
name = "bytes"
|
||||
version = "1.6.1"
|
||||
version = "1.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952"
|
||||
checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da"
|
||||
|
||||
[[package]]
|
||||
name = "cc"
|
||||
version = "1.1.7"
|
||||
version = "1.1.31"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc"
|
||||
checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f"
|
||||
dependencies = [
|
||||
"shlex",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cfg-if"
|
||||
@@ -126,9 +129,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "4.5.11"
|
||||
version = "4.5.20"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "35723e6a11662c2afb578bcf0b88bf6ea8e21282a953428f240574fcc3a2b5b3"
|
||||
checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
|
||||
dependencies = [
|
||||
"clap_builder",
|
||||
"clap_derive",
|
||||
@@ -136,9 +139,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "clap_builder"
|
||||
version = "4.5.11"
|
||||
version = "4.5.20"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "49eb96cbfa7cfa35017b7cd548c75b14c3118c98b423041d70562665e07fb0fa"
|
||||
checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
|
||||
dependencies = [
|
||||
"anstream",
|
||||
"anstyle",
|
||||
@@ -148,9 +151,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "clap_derive"
|
||||
version = "4.5.11"
|
||||
version = "4.5.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5d029b67f89d30bbb547c89fd5161293c0aec155fc691d7924b64550662db93e"
|
||||
checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
|
||||
dependencies = [
|
||||
"heck",
|
||||
"proc-macro2",
|
||||
@@ -173,7 +176,7 @@ checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
|
||||
[[package]]
|
||||
name = "cosmic-protocols"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/pop-os/cosmic-protocols.git#bd65e0f2d55429954839c9e6c7bc5b0d198b85f0"
|
||||
source = "git+https://github.com/pop-os/cosmic-protocols.git#91aeb55052a8e6e15a7ddd53e039a9350f16fa69"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"wayland-backend",
|
||||
@@ -272,9 +275,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "fastrand"
|
||||
version = "2.1.0"
|
||||
version = "2.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
|
||||
checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
|
||||
|
||||
[[package]]
|
||||
name = "fomat-macros"
|
||||
@@ -284,15 +287,15 @@ checksum = "3f722aa875298d34a0ebb6004699f6f4ea830d36dec8ac2effdbbc840248a096"
|
||||
|
||||
[[package]]
|
||||
name = "futures-core"
|
||||
version = "0.3.30"
|
||||
version = "0.3.31"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
|
||||
checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
|
||||
|
||||
[[package]]
|
||||
name = "futures-io"
|
||||
version = "0.3.30"
|
||||
version = "0.3.31"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
|
||||
checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
|
||||
|
||||
[[package]]
|
||||
name = "futures-lite"
|
||||
@@ -322,15 +325,15 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "gimli"
|
||||
version = "0.29.0"
|
||||
version = "0.31.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
|
||||
checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
|
||||
|
||||
[[package]]
|
||||
name = "hashbrown"
|
||||
version = "0.14.5"
|
||||
version = "0.15.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
|
||||
checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
|
||||
|
||||
[[package]]
|
||||
name = "heck"
|
||||
@@ -346,9 +349,9 @@ checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
|
||||
|
||||
[[package]]
|
||||
name = "indexmap"
|
||||
version = "2.2.6"
|
||||
version = "2.6.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
|
||||
checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
|
||||
dependencies = [
|
||||
"equivalent",
|
||||
"hashbrown",
|
||||
@@ -385,9 +388,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.155"
|
||||
version = "0.2.161"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
|
||||
checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
|
||||
|
||||
[[package]]
|
||||
name = "libloading"
|
||||
@@ -470,18 +473,18 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
|
||||
|
||||
[[package]]
|
||||
name = "miniz_oxide"
|
||||
version = "0.7.4"
|
||||
version = "0.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
|
||||
checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
|
||||
dependencies = [
|
||||
"adler",
|
||||
"adler2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "mio"
|
||||
version = "1.0.1"
|
||||
version = "1.0.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4"
|
||||
checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
|
||||
dependencies = [
|
||||
"hermit-abi",
|
||||
"libc",
|
||||
@@ -520,18 +523,18 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "object"
|
||||
version = "0.36.2"
|
||||
version = "0.36.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e"
|
||||
checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "once_cell"
|
||||
version = "1.19.0"
|
||||
version = "1.20.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
|
||||
checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
|
||||
|
||||
[[package]]
|
||||
name = "overload"
|
||||
@@ -541,9 +544,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
|
||||
|
||||
[[package]]
|
||||
name = "parking"
|
||||
version = "2.2.0"
|
||||
version = "2.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
|
||||
checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
|
||||
|
||||
[[package]]
|
||||
name = "pin-project-lite"
|
||||
@@ -553,47 +556,47 @@ checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
|
||||
|
||||
[[package]]
|
||||
name = "pkg-config"
|
||||
version = "0.3.30"
|
||||
version = "0.3.31"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
|
||||
checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.86"
|
||||
version = "1.0.88"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
|
||||
checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quick-xml"
|
||||
version = "0.34.0"
|
||||
version = "0.36.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6f24d770aeca0eacb81ac29dfbc55ebcc09312fdd1f8bbecdc7e4a84e000e3b4"
|
||||
checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.36"
|
||||
version = "1.0.37"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
|
||||
checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "regex"
|
||||
version = "1.10.5"
|
||||
version = "1.11.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
|
||||
checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"memchr",
|
||||
"regex-automata 0.4.7",
|
||||
"regex-syntax 0.8.4",
|
||||
"regex-automata 0.4.8",
|
||||
"regex-syntax 0.8.5",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -607,13 +610,13 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "regex-automata"
|
||||
version = "0.4.7"
|
||||
version = "0.4.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
|
||||
checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"memchr",
|
||||
"regex-syntax 0.8.4",
|
||||
"regex-syntax 0.8.5",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -624,9 +627,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
|
||||
|
||||
[[package]]
|
||||
name = "regex-syntax"
|
||||
version = "0.8.4"
|
||||
version = "0.8.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
|
||||
checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
|
||||
|
||||
[[package]]
|
||||
name = "rustc-demangle"
|
||||
@@ -636,9 +639,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
|
||||
|
||||
[[package]]
|
||||
name = "rustix"
|
||||
version = "0.38.34"
|
||||
version = "0.38.37"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
|
||||
checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"errno",
|
||||
@@ -649,9 +652,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "rustversion"
|
||||
version = "1.0.17"
|
||||
version = "1.0.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
|
||||
checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248"
|
||||
|
||||
[[package]]
|
||||
name = "scoped-tls"
|
||||
@@ -668,6 +671,12 @@ dependencies = [
|
||||
"lazy_static",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "shlex"
|
||||
version = "1.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
|
||||
|
||||
[[package]]
|
||||
name = "signal-hook-registry"
|
||||
version = "1.4.2"
|
||||
@@ -710,9 +719,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.72"
|
||||
version = "2.0.82"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
|
||||
checksum = "83540f837a8afc019423a8edb95b52a8effe46957ee402287f4292fae35be021"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@@ -721,32 +730,31 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tachyonix"
|
||||
version = "0.3.0"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1924ef47bc3b427ea2a0b55ba97d0e9116e9103483ecd75a43f47a66443527c5"
|
||||
checksum = "86c3eafa053bbcc63bb4bfc5eb26362a33ea0bc2e589f28bce00287d1c167d45"
|
||||
dependencies = [
|
||||
"async-event",
|
||||
"crossbeam-utils",
|
||||
"diatomic-waker",
|
||||
"futures-core",
|
||||
"loom",
|
||||
"pin-project-lite",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thiserror"
|
||||
version = "1.0.63"
|
||||
version = "1.0.64"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
|
||||
checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
|
||||
dependencies = [
|
||||
"thiserror-impl",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "thiserror-impl"
|
||||
version = "1.0.63"
|
||||
version = "1.0.64"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
|
||||
checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@@ -765,9 +773,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tokio"
|
||||
version = "1.39.2"
|
||||
version = "1.40.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1"
|
||||
checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
|
||||
dependencies = [
|
||||
"backtrace",
|
||||
"bytes",
|
||||
@@ -854,15 +862,15 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "unicode-ident"
|
||||
version = "1.0.12"
|
||||
version = "1.0.13"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
|
||||
checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-width"
|
||||
version = "0.1.13"
|
||||
version = "0.1.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
|
||||
checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
|
||||
|
||||
[[package]]
|
||||
name = "utf8parse"
|
||||
@@ -896,9 +904,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
|
||||
|
||||
[[package]]
|
||||
name = "wayland-backend"
|
||||
version = "0.3.6"
|
||||
version = "0.3.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f90e11ce2ca99c97b940ee83edbae9da2d56a08f9ea8158550fd77fa31722993"
|
||||
checksum = "056535ced7a150d45159d3a8dc30f91a2e2d588ca0b23f70e56033622b8016f6"
|
||||
dependencies = [
|
||||
"cc",
|
||||
"downcast-rs",
|
||||
@@ -910,9 +918,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wayland-client"
|
||||
version = "0.31.5"
|
||||
version = "0.31.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7e321577a0a165911bdcfb39cf029302479d7527b517ee58ab0f6ad09edf0943"
|
||||
checksum = "e3f45d1222915ef1fd2057220c1d9d9624b7654443ea35c3877f7a52bd0a5a2d"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"rustix",
|
||||
@@ -922,9 +930,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wayland-protocols"
|
||||
version = "0.32.3"
|
||||
version = "0.32.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "62989625a776e827cc0f15d41444a3cea5205b963c3a25be48ae1b52d6b4daaa"
|
||||
checksum = "2b5755d77ae9040bb872a25026555ce4cb0ae75fd923e90d25fba07d81057de0"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"wayland-backend",
|
||||
@@ -935,9 +943,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wayland-protocols-wlr"
|
||||
version = "0.3.3"
|
||||
version = "0.3.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fd993de54a40a40fbe5601d9f1fbcaef0aebcc5fda447d7dc8f6dcbaae4f8953"
|
||||
checksum = "dad87b5fd1b1d3ca2f792df8f686a2a11e3fe1077b71096f7a175ab699f89109"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"wayland-backend",
|
||||
@@ -949,9 +957,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wayland-scanner"
|
||||
version = "0.31.4"
|
||||
version = "0.31.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d7b56f89937f1cf2ee1f1259cf2936a17a1f45d8f0aa1019fae6d470d304cfa6"
|
||||
checksum = "597f2001b2e5fc1121e3d5b9791d3e78f05ba6bfa4641053846248e3a13661c3"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quick-xml",
|
||||
@@ -960,9 +968,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wayland-server"
|
||||
version = "0.31.4"
|
||||
version = "0.31.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2f0a4bab6d420ee4a609b63ef4d5f9b5d309c6b93a029fccab70f2594c0cb3ae"
|
||||
checksum = "0f18d47038c0b10479e695d99ed073e400ccd9bdbb60e6e503c96f62adcb12b6"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"downcast-rs",
|
||||
@@ -974,9 +982,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "wayland-sys"
|
||||
version = "0.31.4"
|
||||
version = "0.31.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "43676fe2daf68754ecf1d72026e4e6c15483198b5d24e888b74d3f22f887a148"
|
||||
checksum = "efa8ac0d8e8ed3e3b5c9fc92c7881406a268e11555abe36493efabe649a29e09"
|
||||
dependencies = [
|
||||
"dlib",
|
||||
"log",
|
||||
|
||||
@@ -9,19 +9,19 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "cosmic-randr";
|
||||
version = "1.0.0-alpha.2";
|
||||
version = "1.0.0-alpha.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pop-os";
|
||||
repo = "cosmic-randr";
|
||||
rev = "epoch-${version}";
|
||||
hash = "sha256-g9zoqjPHRv6Tw/Xn8VtFS3H/66tfHSl/DR2lH3Z2ysA=";
|
||||
hash = "sha256-xakK4APhlNKuWbCMP6nJXLyOaQ0hFCvzOht3P8CkV/0=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"cosmic-protocols-0.1.0" = "sha256-zWuvZrg39REZpviQPfLNyfmWBzMS7A7IBUTi8ZRhxXs=";
|
||||
"cosmic-protocols-0.1.0" = "sha256-6XM6kcM2CEGAziCkal4uO0EL1nEWOKb3rFs7hFh6r7Y=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
}:
|
||||
|
||||
let
|
||||
version = "2024.9.0";
|
||||
version = "2024.9.1";
|
||||
# nix version of install-onlyoffice.sh
|
||||
# a later version could rebuild from sdkjs/web-apps as per
|
||||
# https://github.com/cryptpad/onlyoffice-builds/blob/main/build.sh
|
||||
@@ -68,10 +68,10 @@ buildNpmPackage {
|
||||
owner = "cryptpad";
|
||||
repo = "cryptpad";
|
||||
rev = version;
|
||||
hash = "sha256-OUtWaDVLRUbKS0apwY0aNq4MalGFv+fH9VA7LvWWYRs=";
|
||||
hash = "sha256-0BmTVr9L5SbvtemoIIHp874s/alKz3GTqb+R8q23TSM=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-pK0b7q1kJja9l8ANwudbfo3jpldwuO56kuulS8X9A5s=";
|
||||
npmDepsHash = "sha256-TT9vP+9D4xcUc8j7ai1WgSyMy3hpxjYIld8zAFcgqlg=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeBinaryWrapper
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dnf5";
|
||||
version = "5.2.6.2";
|
||||
version = "5.2.7.0";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "rpm-software-management";
|
||||
repo = "dnf5";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-V/8vVKgQphWiCfdIlBMPHaJiOSIYUIEeYdt9Rm+8rCY=";
|
||||
hash = "sha256-gKPC8nrEoayOGGrO+pk164w1xRuhrx74JcxJ1JDhOug=";
|
||||
};
|
||||
|
||||
nativeBuildInputs =
|
||||
@@ -102,13 +102,14 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
'';
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "/usr/lib/systemd/system" "$out/lib/systemd/system"
|
||||
substituteInPlace dnf5daemon-server/dbus/CMakeLists.txt \
|
||||
--replace '/etc' "$out/etc" \
|
||||
--replace '/usr' "$out"
|
||||
--replace-fail "/usr" "$out"
|
||||
substituteInPlace dnf5daemon-server/polkit/CMakeLists.txt \
|
||||
--replace '/usr' "$out"
|
||||
--replace-fail "/usr" "$out"
|
||||
substituteInPlace dnf5/CMakeLists.txt \
|
||||
--replace '/etc/bash_completion.d' "$out/etc/bash_completion.d"
|
||||
--replace-fail "/etc/bash_completion.d" "$out/etc/bash_completion.d"
|
||||
'';
|
||||
|
||||
dontFixCmake = true;
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
pnpm_9,
|
||||
nodejs,
|
||||
cargo-tauri,
|
||||
cargo-tauri_1,
|
||||
pkg-config,
|
||||
wrapGAppsHook3,
|
||||
makeBinaryWrapper,
|
||||
@@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec {
|
||||
[
|
||||
pnpm_9.configHook
|
||||
nodejs
|
||||
cargo-tauri.hook
|
||||
cargo-tauri_1.hook
|
||||
pkg-config
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ wrapGAppsHook3 ]
|
||||
|
||||
@@ -2,16 +2,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "fblog";
|
||||
version = "4.13.0";
|
||||
version = "4.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "brocode";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-MfE1IwJ8n9wFrs3l33h3aeG8t8SVxRG4VZGpgVrjTW8=";
|
||||
hash = "sha256-YOHLw8YCgOGB1Nn2tD+EnicKd/tiMk07OWv+49btbpw=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-6joXL/eHipyBVNFz0zSH2UldZ1jYUFeOxB1weNAA9b4=";
|
||||
cargoHash = "sha256-+rhrvZ8EOYAFSvAvGyUwlDCWXVqgXPdmugBbrn12yLg=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Small command-line JSON log viewer";
|
||||
|
||||
@@ -16,27 +16,6 @@
|
||||
webkitgtk_4_1,
|
||||
}:
|
||||
|
||||
let
|
||||
cargo-tauri_2 =
|
||||
let
|
||||
pname = "cargo-tauri";
|
||||
version = "2.0.0-rc.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tauri-apps";
|
||||
repo = "tauri";
|
||||
rev = "tauri-v${version}";
|
||||
hash = "sha256-PV8m/MzYgbY4Hv71dZrqVbrxmxrwFfOAraLJIaQk6FQ=";
|
||||
};
|
||||
in
|
||||
cargo-tauri.overrideAttrs {
|
||||
inherit src version;
|
||||
cargoDeps = rustPlatform.fetchCargoTarball {
|
||||
inherit pname version src;
|
||||
sourceRoot = "${src.name}/tooling/cli";
|
||||
hash = "sha256-JPlMaoPw6a7D20KQH7iuhHKfGT5oUKf55tMaMYEM/Z4=";
|
||||
};
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "gale";
|
||||
version = "0.8.11";
|
||||
@@ -68,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
npmHooks.npmConfigHook
|
||||
nodejs
|
||||
rustPlatform.cargoSetupHook
|
||||
(cargo-tauri.hook.override { cargo-tauri = cargo-tauri_2; })
|
||||
cargo-tauri.hook
|
||||
rustPlatform.cargoCheckHook
|
||||
pkg-config
|
||||
wrapGAppsHook3
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
fetchFromGitHub,
|
||||
pnpm_9,
|
||||
wrapGAppsHook3,
|
||||
cargo-tauri,
|
||||
cargo-tauri_1,
|
||||
darwin,
|
||||
desktop-file-utils,
|
||||
esbuild,
|
||||
@@ -55,7 +55,7 @@ rustPlatform.buildRustPackage rec {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cargo-tauri.hook
|
||||
cargo-tauri_1.hook
|
||||
desktop-file-utils
|
||||
jq
|
||||
moreutils
|
||||
|
||||
@@ -11,17 +11,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "gpauth";
|
||||
version = "2.3.7";
|
||||
version = "2.3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yuezk";
|
||||
repo = "GlobalProtect-openconnect";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Zr888II65bUjrbStZfD0AYCXKY6VdKVJHQhbKwaY3is=";
|
||||
hash = "sha256-s+uCpNrwQvdIINLSIbtcCCBg469J2xtlyiwDYqtXrQs=";
|
||||
};
|
||||
|
||||
buildAndTestSubdir = "apps/gpauth";
|
||||
cargoHash = "sha256-AuYw8CC0bMJzIJJQXhcQajQ4SACz4aKv6rG4HMq7U18=";
|
||||
cargoHash = "sha256-QHqPVsMPKgAhhZwah3g1jqidl3UnvvKZnM4r1coUHSs=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
perl
|
||||
@@ -45,6 +45,9 @@ rustPlatform.buildRustPackage rec {
|
||||
'';
|
||||
homepage = "https://github.com/${src.owner}/${src.repo}";
|
||||
license = with licenses; [ gpl3Only ];
|
||||
maintainers = with maintainers; [ binary-eater ];
|
||||
maintainers = with maintainers; [
|
||||
binary-eater
|
||||
m1dugh
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
|
||||
inherit (gpauth) version src meta;
|
||||
|
||||
buildAndTestSubdir = "apps/gpclient";
|
||||
cargoHash = "sha256-aJYFBvVrj1n2+9WLLBH5WTRRzTle19LsdJ2DielJYik=";
|
||||
cargoHash = "sha256-lKfcWKOxpXEB28JajypOdyJNxLIAI8udMlaEo+6pecQ=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
perl
|
||||
@@ -47,6 +47,6 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
postFixup = ''
|
||||
substituteInPlace $out/share/applications/gpgui.desktop \
|
||||
--replace-fail /usr/bin/gpclient $out/bin/gpclient
|
||||
--replace-fail /usr/bin/gpclient gpclient
|
||||
'';
|
||||
}
|
||||
|
||||
@@ -12,22 +12,25 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "hugo";
|
||||
version = "0.136.5";
|
||||
version = "0.138.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gohugoio";
|
||||
repo = "hugo";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-NluV9/tqWTRfs2u9g4cHC1TyrxOXx3ghOZ4GDx7OZFo=";
|
||||
hash = "sha256-IDWQRPJrTCkvcTcsaGuyQraVoWWUe0d6FTQvvYHZcD0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-KqDsa7MlSONyn7AYOepQ95q1CEM83AhWk23iYSQ4twU=";
|
||||
vendorHash = "sha256-5YS76L7kisyPz8yv2RCgZHpY/AkjdHE+SUwMOuo3uLg=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
proxyVendor = true;
|
||||
|
||||
tags = [ "extended" ];
|
||||
tags = [
|
||||
"extended"
|
||||
"withdeploy"
|
||||
];
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "hunt";
|
||||
version = "2.4.0";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "LyonSyonII";
|
||||
repo = "hunt-rs";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NKXZECtepuFg6qTuXF9Gnat/vnrygt3UOZb0YUKPqi8=";
|
||||
sha256 = "sha256-aNU4Ik033+kl9ZPHFzaAXZ6Hs+b7m5s0lpr1oovmWm0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ExwcFJVqQF/RTUyv1FvOCnlB+9Z7uhi/5UUjW7WcXTk=";
|
||||
cargoHash = "sha256-6sr0PU/Gb3CZ+RzvnEcu/v/F3PMyednCEk5wPSvwgmQ=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simplified Find command made with Rust";
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
, stdenv
|
||||
, yarnConfigHook
|
||||
, nodejs-slim
|
||||
, cargo-tauri
|
||||
, cargo-tauri_1
|
||||
, cargo
|
||||
, rustPlatform
|
||||
, rustc
|
||||
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
|
||||
rustPlatform.cargoSetupHook
|
||||
cargo
|
||||
rustc
|
||||
cargo-tauri.hook
|
||||
cargo-tauri_1.hook
|
||||
yarnConfigHook
|
||||
nodejs-slim
|
||||
cyrus_sasl
|
||||
|
||||
@@ -25,6 +25,10 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
})
|
||||
];
|
||||
|
||||
configureFlags = [
|
||||
(lib.enableFeature (!stdenv.hostPlatform.isDarwin) "sdltest")
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
SDL
|
||||
SDL_mixer
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
{
|
||||
"stable": {
|
||||
"version": "5.7.0",
|
||||
"hash": "sha256-OLhoy18/y6Z5KjjbJiQ3r2ZeOBtn62paDu4aNYL3n0w="
|
||||
"version": "5.9.0",
|
||||
"hash": "sha256-i3jpLRidpkg6+LwNFTRKXJoiWOJdd1H41e1wIFAc7Bw="
|
||||
},
|
||||
"beta": {
|
||||
"version": "5.7.0",
|
||||
"hash": "sha256-OLhoy18/y6Z5KjjbJiQ3r2ZeOBtn62paDu4aNYL3n0w="
|
||||
"version": "5.9.0",
|
||||
"hash": "sha256-i3jpLRidpkg6+LwNFTRKXJoiWOJdd1H41e1wIFAc7Bw="
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,14 +5,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "malwoverview";
|
||||
version = "6.0.0";
|
||||
version = "6.0.1";
|
||||
pyproject = true;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "alexandreborges";
|
||||
repo = "malwoverview";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-qwNWYwMkxnRczqc4QvniuqwDVgpSlNTVOpzbzYcoMFg=";
|
||||
hash = "sha256-N9jXMkX3Kt3ldw/QgJRAE2ItrzjXzQthQ9UULRtnN0A=";
|
||||
};
|
||||
|
||||
pythonRemoveDeps = [
|
||||
|
||||
@@ -11,13 +11,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "manifold";
|
||||
version = "2.5.1-unstable-2024-09-15";
|
||||
version = "2.5.1-unstable-2024-11-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elalish";
|
||||
repo = "manifold";
|
||||
rev = "22c66051dfdbcefa2012e30dd12c9b5a20f89a01";
|
||||
hash = "sha256-Fbev5dTgXjXdC7fzWfHnypTBel++DiMns8OzN1bH1OA=";
|
||||
rev = "66bca6e3fdfce0f590ca84edc1a6256502636f4b";
|
||||
hash = "sha256-XgmJtkBf5SOgvtwU2x1cJLjEQKEmKnB40oIaoYrUYEQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
fetchFromGitHub,
|
||||
rustPlatform,
|
||||
cacert,
|
||||
cargo-tauri,
|
||||
cargo-tauri_1,
|
||||
darwin,
|
||||
desktop-file-utils,
|
||||
libsoup,
|
||||
@@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cacert # required for turbo
|
||||
cargo-tauri.hook
|
||||
cargo-tauri_1.hook
|
||||
desktop-file-utils
|
||||
nodejs
|
||||
pkg-config
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
rustPlatform,
|
||||
cargo,
|
||||
rustc,
|
||||
cargo-tauri,
|
||||
cargo-tauri_1,
|
||||
|
||||
pkg-config,
|
||||
wrapGAppsHook3,
|
||||
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
rustPlatform.cargoSetupHook
|
||||
cargo
|
||||
rustc
|
||||
cargo-tauri.hook
|
||||
cargo-tauri_1.hook
|
||||
pkg-config
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "nwg-menu";
|
||||
version = "0.1.3";
|
||||
version = "0.1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nwg-piotr";
|
||||
repo = "nwg-menu";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-PMW5QUUZcdWNOMexJVy0hYXx+y2AopT3WL29iWb9MbM=";
|
||||
sha256 = "sha256-njh2GGYg3YbBXh3h6zrTJc9E0ehAbmaVQN/2DdsBjQU=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-PJvHDmyqE+eIELGRD8QHsZgZ7L0DKc2FYOvfvurzlhs=";
|
||||
vendorHash = "sha256-l6Xfna4btWhUGqqmIx6+s+cR9YZ33KQyEviySd2Eopw=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@@ -129,6 +129,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) openldap;
|
||||
kerberosWithLdap = nixosTests.kerberos.ldap;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -43,12 +43,12 @@
|
||||
# clang consume much less RAM than GCC
|
||||
clangStdenv.mkDerivation rec {
|
||||
pname = "openscad-unstable";
|
||||
version = "2024-10-06";
|
||||
version = "2024-11-10";
|
||||
src = fetchFromGitHub {
|
||||
owner = "openscad";
|
||||
repo = "openscad";
|
||||
rev = "4e4543d85dfb19630ffe499b75828d48d246bd22";
|
||||
hash = "sha256-k1RjXwjigQAVKUHeAJAyJxfCr8qNkCDFq9p78sudjgs=";
|
||||
rev = "681fff1cdcd5f67253958c39d9fefdc3762b38d8";
|
||||
hash = "sha256-aFrlFFbpEBt4JJ3HCZLmaptomZBpCTqLD7vKIspDX74=";
|
||||
fetchSubmodules = true; # Only really need sanitizers-cmake and MCAD
|
||||
};
|
||||
|
||||
|
||||
@@ -4,13 +4,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "orbiton";
|
||||
version = "2.67.1";
|
||||
version = "2.68.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xyproto";
|
||||
repo = "orbiton";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/5USD588kr3uB/Zs1ASKVgxH4kAWZCNBrZL7qqx49gU=";
|
||||
hash = "sha256-aCGdBG3AqD8PJHIHhie0KELQNRcD8JQfmjM2bDEjFbo=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@@ -9,10 +9,10 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "peergos";
|
||||
version = "0.20.0";
|
||||
version = "0.21.0";
|
||||
src = fetchurl {
|
||||
url = "https://github.com/Peergos/web-ui/releases/download/v${version}/Peergos.jar";
|
||||
hash = "sha256-Kk0ahAsvfTYkmVZTDE+QhyDFHQFY6lpWhmIOYBeJ1xk=";
|
||||
hash = "sha256-jhZ/75MM6DSXgux+rniINQrvlvPldnAaCe3E/2IHziM=";
|
||||
};
|
||||
|
||||
dontUnpack = true;
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
wrapGAppsHook3,
|
||||
cargo,
|
||||
rustc,
|
||||
cargo-tauri,
|
||||
cargo-tauri_1,
|
||||
pkg-config,
|
||||
esbuild,
|
||||
buildGoModule,
|
||||
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
rustPlatform.cargoSetupHook
|
||||
cargo
|
||||
rustc
|
||||
cargo-tauri.hook
|
||||
cargo-tauri_1.hook
|
||||
nodejs
|
||||
pnpm.configHook
|
||||
wrapGAppsHook3
|
||||
|
||||
@@ -6,16 +6,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "protols";
|
||||
version = "0.6.2";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coder3101";
|
||||
repo = "protols";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-2dP3papZsZxvpSfgGTdoRVSZTcOC0iHPBfMmlzB5iJQ=";
|
||||
hash = "sha256-Y2gmOlQO6yP/sP2z4NJGbJimlSC5Q7B9Lw8BinzOwHA=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-94URDioPZXKSSFINTdPBYcES2eGCbhJ46tvcVRWt06o=";
|
||||
cargoHash = "sha256-xi1nJ0/rIDYUGJkxtjAysR77+FtmpD97OuuFX0oLuc0=";
|
||||
|
||||
meta = {
|
||||
description = "Protocol Buffers language server written in Rust";
|
||||
|
||||
@@ -8,15 +8,15 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rwpspread";
|
||||
version = "0.3.0";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "0xk1f0";
|
||||
repo = "rwpspread";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-B8K8/M5cUSchG54ar0ZY2XOH6lYLimdZr+dk5ffdplY=";
|
||||
hash = "sha256-ivxu1UsQLUm017A5Za82+l1bQoYA/TF/I1BwUQD3dWo=";
|
||||
};
|
||||
cargoHash = "sha256-bTCXgaE8+nxuEFeOMSihL3lfmbIxiv1f400rmyV2b8k=";
|
||||
cargoHash = "sha256-pIsSH8cQYyG7v7z4O2R80kA4QHvKyTajBfqmRXjuQW8=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
|
||||
@@ -22,23 +22,6 @@
|
||||
}:
|
||||
|
||||
let
|
||||
cargo-tauri_2 = let
|
||||
version = "2.0.0-rc.3";
|
||||
src = fetchFromGitHub {
|
||||
owner = "tauri-apps";
|
||||
repo = "tauri";
|
||||
rev = "tauri-v${version}";
|
||||
hash = "sha256-PV8m/MzYgbY4Hv71dZrqVbrxmxrwFfOAraLJIaQk6FQ=";
|
||||
};
|
||||
in cargo-tauri.overrideAttrs (drv: {
|
||||
inherit src version;
|
||||
cargoDeps = drv.cargoDeps.overrideAttrs (lib.const {
|
||||
inherit src;
|
||||
name = "tauri-${version}-vendor.tar.gz";
|
||||
outputHash = "sha256-BrIH0JkGMp68O+4B+0g7X3lSdNSPXo+otlBgslCzPZE=";
|
||||
});
|
||||
});
|
||||
|
||||
esbuild_21-5 = let
|
||||
version = "0.21.5";
|
||||
in esbuild.override {
|
||||
@@ -90,7 +73,7 @@ in stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [
|
||||
cargo
|
||||
(cargo-tauri.hook.override { cargo-tauri = cargo-tauri_2; })
|
||||
cargo-tauri.hook
|
||||
gobject-introspection
|
||||
makeBinaryWrapper
|
||||
nodejs
|
||||
|
||||
@@ -1,8 +1,27 @@
|
||||
{ fetchFromGitHub, gperf, openssl, readline, zlib, cmake, lib, stdenv }:
|
||||
{ fetchFromGitHub, gperf, openssl, readline, zlib, cmake, lib, stdenv,
|
||||
writeShellApplication, common-updater-scripts, jq }:
|
||||
|
||||
let
|
||||
updateScript = writeShellApplication {
|
||||
name = "update-tdlib";
|
||||
|
||||
runtimeInputs = [ jq common-updater-scripts ];
|
||||
|
||||
text = ''
|
||||
commit_msg="^Update version to (?<v>\\\\d+.\\\\d+.\\\\d+)\\\\.$"
|
||||
commit=$(curl -s "https://api.github.com/repos/tdlib/td/commits?path=CMakeLists.txt" | jq -c "map(select(.commit.message | test(\"''${commit_msg}\"))) | first")
|
||||
|
||||
rev=$(echo "$commit" | jq -r ".sha")
|
||||
version=$(echo "$commit" | jq -r ".commit.message | capture(\"''${commit_msg}\") | .v")
|
||||
|
||||
update-source-version tdlib "$version" --rev="$rev"
|
||||
'';
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "tdlib";
|
||||
version = "1.8.38";
|
||||
version = "1.8.39";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tdlib";
|
||||
@@ -11,8 +30,8 @@ stdenv.mkDerivation {
|
||||
# The tdlib authors do not set tags for minor versions, but
|
||||
# external programs depending on tdlib constrain the minor
|
||||
# version, hence we set a specific commit with a known version.
|
||||
rev = "d321984b75fccdb76239529e8aadcf7f80b0e35a";
|
||||
hash = "sha256-5QNcpwW0viWUtsW7b5oSq6X0tRyup6V5CT/BNhdv6lw=";
|
||||
rev = "056963e48fa8d3f89556239c22d6ac843d3c8a5b";
|
||||
hash = "sha256-pQ+uYnyBTH4L6RW3MqAttx7K3z8fyEbzRy8JSjbBL98=";
|
||||
};
|
||||
|
||||
buildInputs = [ gperf openssl readline zlib ];
|
||||
@@ -30,6 +49,8 @@ stdenv.mkDerivation {
|
||||
sed -i "/vptr/d" test/CMakeLists.txt
|
||||
'';
|
||||
|
||||
passthru.updateScript = lib.getExe updateScript;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cross-platform library for building Telegram clients";
|
||||
homepage = "https://core.telegram.org/tdlib/";
|
||||
|
||||
@@ -5,16 +5,16 @@
|
||||
}:
|
||||
buildGoModule rec {
|
||||
pname = "testkube";
|
||||
version = "2.1.56";
|
||||
version = "2.1.61";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "kubeshop";
|
||||
repo = "testkube";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-P+A9lUMzQ3M0SEVZBMDSMj8S0uCsEhadv5vDRxbQORA=";
|
||||
hash = "sha256-fCWnbUNEKVD5bKcowdgPDg35yRAM79MFapvViAzHX64=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-44aIwddMH6CMfTno90xGkHgna4DO2Ii3KhpMwv6Zjmo=";
|
||||
vendorHash = "sha256-l8RncoFKQC26D+5GLpGr5emCJASEiCQQ9K5PSAuMdPI=";
|
||||
|
||||
ldflags = [
|
||||
"-X main.version=${version}"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ lib
|
||||
, cargo-tauri
|
||||
, cargo-tauri_1
|
||||
, cmake
|
||||
, dbus
|
||||
, fetchgit
|
||||
@@ -87,7 +87,7 @@ rustPlatform.buildRustPackage {
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
cargo-tauri
|
||||
cargo-tauri_1
|
||||
wrapGAppsHook3
|
||||
];
|
||||
|
||||
|
||||
@@ -14,13 +14,13 @@
|
||||
}:
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "vencord";
|
||||
version = "1.10.6";
|
||||
version = "1.10.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Vendicated";
|
||||
repo = "Vencord";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-Pp8QpagTgWWHoC+e/iGfEveQYuMDDX7Oz1IAUx8cp3A=";
|
||||
hash = "sha256-/CZzRIXD0shEok9H+Vx7s9BmzXTI6ly957jvS+nU2fI=";
|
||||
};
|
||||
|
||||
pnpmDeps = pnpm.fetchDeps {
|
||||
@@ -51,8 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
)
|
||||
);
|
||||
VENCORD_REMOTE = "${finalAttrs.src.owner}/${finalAttrs.src.repo}";
|
||||
# TODO: somehow update this automatically
|
||||
VENCORD_HASH = "deadbeef";
|
||||
VENCORD_HASH = "${finalAttrs.version}";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cargo-tauri,
|
||||
cargo-tauri_1,
|
||||
libsoup,
|
||||
nodejs,
|
||||
openssl,
|
||||
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cargo-tauri.hook
|
||||
cargo-tauri_1.hook
|
||||
nodejs
|
||||
pkg-config
|
||||
pnpm.configHook
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "wl-restart";
|
||||
version = "0.2.0";
|
||||
version = "0.3.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Ferdi265";
|
||||
repo = "wl-restart";
|
||||
rev = "refs/tags/v${finalAttrs.version}";
|
||||
hash = "sha256-pMsYLU9pjN2cgz7FxJJwkDHKJt1mIAuagJSBjrPUMAM=";
|
||||
hash = "sha256-wLaZBqw/Yx0Oc7s3ffAmx3zakjhEBHM09uJcfsVHbnQ=";
|
||||
};
|
||||
|
||||
cmakeFlags = [ (lib.cmakeBool "INSTALL_DOCUMENTATION" true) ];
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "xq";
|
||||
version = "1.2.4";
|
||||
version = "1.2.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sibprogrammer";
|
||||
repo = "xq";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-g1d5sS3tgxP2VRogWG/5OXezDsJuQ6e724te+Oj3r24=";
|
||||
hash = "sha256-Xr5k7YBx8GjrBapmThpLnPPvzEP6mcQG4mKXxZaEan4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-Oy/BBE6qCKJQRNDn6UiBr+/Psgi3A9Eaytmbmjt7eq8=";
|
||||
vendorHash = "sha256-UV6Z4GyeFPkiyhUll7hCFkt+iBdWAl02QdzYYX0N2e4=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
Generated
+99
-71
@@ -9,7 +9,7 @@ dependencies = [
|
||||
"anyhow",
|
||||
"auto_update",
|
||||
"editor",
|
||||
"extension",
|
||||
"extension_host",
|
||||
"futures 0.3.30",
|
||||
"gpui",
|
||||
"language",
|
||||
@@ -544,9 +544,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "async-compression"
|
||||
version = "0.4.13"
|
||||
version = "0.4.17"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7e614738943d3f68c628ae3dbce7c3daffb196665f82f8c8ea6b65de73c79429"
|
||||
checksum = "0cb8f1d480b0ea3783ab015936d2a55c87e219676f0c0b7dec61494043f21857"
|
||||
dependencies = [
|
||||
"deflate64",
|
||||
"flate2",
|
||||
@@ -854,7 +854,7 @@ dependencies = [
|
||||
"chrono",
|
||||
"futures-util",
|
||||
"http-types",
|
||||
"hyper 0.14.30",
|
||||
"hyper 0.14.31",
|
||||
"hyper-rustls 0.24.2",
|
||||
"serde",
|
||||
"serde_json",
|
||||
@@ -1350,7 +1350,7 @@ dependencies = [
|
||||
"http-body 0.4.6",
|
||||
"http-body 1.0.1",
|
||||
"httparse",
|
||||
"hyper 0.14.30",
|
||||
"hyper 0.14.31",
|
||||
"hyper-rustls 0.24.2",
|
||||
"once_cell",
|
||||
"pin-project-lite",
|
||||
@@ -1441,7 +1441,7 @@ dependencies = [
|
||||
"headers",
|
||||
"http 0.2.12",
|
||||
"http-body 0.4.6",
|
||||
"hyper 0.14.30",
|
||||
"hyper 0.14.31",
|
||||
"itoa",
|
||||
"matchit",
|
||||
"memchr",
|
||||
@@ -2366,7 +2366,7 @@ dependencies = [
|
||||
"clickhouse-derive",
|
||||
"clickhouse-rs-cityhash-sys",
|
||||
"futures 0.3.30",
|
||||
"hyper 0.14.30",
|
||||
"hyper 0.14.31",
|
||||
"hyper-tls",
|
||||
"lz4",
|
||||
"sealed",
|
||||
@@ -2432,7 +2432,6 @@ dependencies = [
|
||||
"smol",
|
||||
"sysinfo",
|
||||
"telemetry_events",
|
||||
"tempfile",
|
||||
"text",
|
||||
"thiserror",
|
||||
"time",
|
||||
@@ -2569,7 +2568,7 @@ dependencies = [
|
||||
"gpui",
|
||||
"hex",
|
||||
"http_client",
|
||||
"hyper 0.14.30",
|
||||
"hyper 0.14.31",
|
||||
"indoc",
|
||||
"jsonwebtoken",
|
||||
"language",
|
||||
@@ -3491,7 +3490,6 @@ dependencies = [
|
||||
"ctor",
|
||||
"editor",
|
||||
"env_logger 0.11.5",
|
||||
"futures 0.3.30",
|
||||
"gpui",
|
||||
"language",
|
||||
"log",
|
||||
@@ -3718,6 +3716,7 @@ dependencies = [
|
||||
"tree-sitter-rust",
|
||||
"tree-sitter-typescript",
|
||||
"ui",
|
||||
"unicode-script",
|
||||
"unicode-segmentation",
|
||||
"unindent",
|
||||
"url",
|
||||
@@ -4092,6 +4091,51 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "extension"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-compression",
|
||||
"async-tar",
|
||||
"collections",
|
||||
"fs",
|
||||
"futures 0.3.30",
|
||||
"http_client",
|
||||
"language",
|
||||
"log",
|
||||
"lsp",
|
||||
"semantic_version",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"toml 0.8.19",
|
||||
"wasm-encoder 0.215.0",
|
||||
"wasmparser 0.215.0",
|
||||
"wit-component",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "extension_cli"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"clap",
|
||||
"env_logger 0.11.5",
|
||||
"extension",
|
||||
"fs",
|
||||
"language",
|
||||
"log",
|
||||
"reqwest_client",
|
||||
"rpc",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"theme",
|
||||
"tokio",
|
||||
"toml 0.8.19",
|
||||
"tree-sitter",
|
||||
"wasmtime",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "extension_host"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"assistant_slash_command",
|
||||
@@ -4102,6 +4146,7 @@ dependencies = [
|
||||
"collections",
|
||||
"ctor",
|
||||
"env_logger 0.11.5",
|
||||
"extension",
|
||||
"fs",
|
||||
"futures 0.3.30",
|
||||
"gpui",
|
||||
@@ -4129,36 +4174,11 @@ dependencies = [
|
||||
"ui",
|
||||
"url",
|
||||
"util",
|
||||
"wasm-encoder 0.215.0",
|
||||
"wasmparser 0.215.0",
|
||||
"wasmtime",
|
||||
"wasmtime-wasi",
|
||||
"wit-component",
|
||||
"workspace",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "extension_cli"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"clap",
|
||||
"env_logger 0.11.5",
|
||||
"extension",
|
||||
"fs",
|
||||
"language",
|
||||
"log",
|
||||
"reqwest_client",
|
||||
"rpc",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"theme",
|
||||
"tokio",
|
||||
"toml 0.8.19",
|
||||
"tree-sitter",
|
||||
"wasmtime",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "extensions_ui"
|
||||
version = "0.1.0"
|
||||
@@ -4168,7 +4188,7 @@ dependencies = [
|
||||
"collections",
|
||||
"db",
|
||||
"editor",
|
||||
"extension",
|
||||
"extension_host",
|
||||
"fs",
|
||||
"fuzzy",
|
||||
"gpui",
|
||||
@@ -4388,9 +4408,9 @@ checksum = "8ce81f49ae8a0482e4c55ea62ebbd7e5a686af544c00b9d090bba3ff9be97b3d"
|
||||
|
||||
[[package]]
|
||||
name = "flume"
|
||||
version = "0.11.0"
|
||||
version = "0.11.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
|
||||
checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095"
|
||||
dependencies = [
|
||||
"futures-core",
|
||||
"futures-sink",
|
||||
@@ -5570,9 +5590,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
|
||||
|
||||
[[package]]
|
||||
name = "hyper"
|
||||
version = "0.14.30"
|
||||
version = "0.14.31"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9"
|
||||
checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85"
|
||||
dependencies = [
|
||||
"bytes 1.7.2",
|
||||
"futures-channel",
|
||||
@@ -5620,7 +5640,7 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
|
||||
dependencies = [
|
||||
"futures-util",
|
||||
"http 0.2.12",
|
||||
"hyper 0.14.30",
|
||||
"hyper 0.14.31",
|
||||
"log",
|
||||
"rustls 0.21.12",
|
||||
"rustls-native-certs 0.6.3",
|
||||
@@ -5653,7 +5673,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
|
||||
dependencies = [
|
||||
"bytes 1.7.2",
|
||||
"hyper 0.14.30",
|
||||
"hyper 0.14.31",
|
||||
"native-tls",
|
||||
"tokio",
|
||||
"tokio-native-tls",
|
||||
@@ -5776,6 +5796,7 @@ dependencies = [
|
||||
"gpui",
|
||||
"project",
|
||||
"settings",
|
||||
"theme",
|
||||
"ui",
|
||||
"workspace",
|
||||
]
|
||||
@@ -6157,12 +6178,11 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "jupyter-serde"
|
||||
version = "0.2.0"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0a444fb3f87ee6885eb316028cc998c7d84811663ef95d78c419419423d5a054"
|
||||
checksum = "dd71aa17c4fa65e6d7536ab2728881a41f8feb2ee5841c2240516c3c3d65d8b3"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"chrono",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"thiserror",
|
||||
@@ -6309,6 +6329,7 @@ dependencies = [
|
||||
"settings",
|
||||
"smol",
|
||||
"strum 0.25.0",
|
||||
"telemetry_events",
|
||||
"text",
|
||||
"theme",
|
||||
"thiserror",
|
||||
@@ -6346,6 +6367,7 @@ dependencies = [
|
||||
"env_logger 0.11.5",
|
||||
"futures 0.3.30",
|
||||
"gpui",
|
||||
"itertools 0.13.0",
|
||||
"language",
|
||||
"lsp",
|
||||
"project",
|
||||
@@ -6357,6 +6379,7 @@ dependencies = [
|
||||
"ui",
|
||||
"util",
|
||||
"workspace",
|
||||
"zed_actions",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -6368,7 +6391,6 @@ dependencies = [
|
||||
"async-tar",
|
||||
"async-trait",
|
||||
"collections",
|
||||
"feature_flags",
|
||||
"futures 0.3.30",
|
||||
"gpui",
|
||||
"http_client",
|
||||
@@ -6380,6 +6402,7 @@ dependencies = [
|
||||
"pet",
|
||||
"pet-conda",
|
||||
"pet-core",
|
||||
"pet-fs",
|
||||
"pet-poetry",
|
||||
"pet-reporter",
|
||||
"project",
|
||||
@@ -6445,9 +6468,9 @@ checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.159"
|
||||
version = "0.2.161"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
|
||||
checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
|
||||
|
||||
[[package]]
|
||||
name = "libdbus-sys"
|
||||
@@ -6553,18 +6576,18 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "linkme"
|
||||
version = "0.3.28"
|
||||
version = "0.3.29"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3c943daedff228392b791b33bba32e75737756e80a613e32e246c6ce9cbab20a"
|
||||
checksum = "70fe496a7af8c406f877635cbf3cd6a9fac9d6f443f58691cd8afe6ce0971af4"
|
||||
dependencies = [
|
||||
"linkme-impl",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "linkme-impl"
|
||||
version = "0.3.28"
|
||||
version = "0.3.29"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cb26336e6dc7cc76e7927d2c9e7e3bb376d7af65a6f56a0b16c47d18a9b1abc5"
|
||||
checksum = "b01f197a15988fb5b2ec0a5a9800c97e70771499c456ad757d63b3c5e9b96e75"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
@@ -7154,9 +7177,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "nbformat"
|
||||
version = "0.3.1"
|
||||
version = "0.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "146074ad45cab20f5d98ccded164826158471f21d04f96e40b9872529e10979d"
|
||||
checksum = "c9ffb2ca556072f114bcaf2ca01dde7f1bc8a4946097dd804cb5a22d8af7d6df"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"chrono",
|
||||
@@ -7771,6 +7794,7 @@ dependencies = [
|
||||
"project",
|
||||
"rope",
|
||||
"serde_json",
|
||||
"settings",
|
||||
"smol",
|
||||
"theme",
|
||||
"tree-sitter-rust",
|
||||
@@ -7795,6 +7819,7 @@ dependencies = [
|
||||
"language",
|
||||
"log",
|
||||
"menu",
|
||||
"outline",
|
||||
"pretty_assertions",
|
||||
"project",
|
||||
"schemars",
|
||||
@@ -7929,9 +7954,9 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
|
||||
|
||||
[[package]]
|
||||
name = "pathdiff"
|
||||
version = "0.2.1"
|
||||
version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
|
||||
checksum = "d61c5ce1153ab5b689d0c074c4e7fc613e942dfb7dd9eea5ab202d2ad91fe361"
|
||||
|
||||
[[package]]
|
||||
name = "pathfinder_geometry"
|
||||
@@ -8806,27 +8831,27 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.87"
|
||||
version = "1.0.89"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a"
|
||||
checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "profiling"
|
||||
version = "1.0.15"
|
||||
version = "1.0.16"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "43d84d1d7a6ac92673717f9f6d1518374ef257669c24ebc5ac25d5033828be58"
|
||||
checksum = "afbdc74edc00b6f6a218ca6a5364d6226a259d4b8ea1af4a0ea063f27e179f4d"
|
||||
dependencies = [
|
||||
"profiling-procmacros",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "profiling-procmacros"
|
||||
version = "1.0.15"
|
||||
version = "1.0.16"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd"
|
||||
checksum = "a65f2e60fbf1063868558d69c6beacf412dc755f9fc020f514b7955fc914fe30"
|
||||
dependencies = [
|
||||
"quote",
|
||||
"syn 2.0.76",
|
||||
@@ -9536,6 +9561,7 @@ dependencies = [
|
||||
"itertools 0.13.0",
|
||||
"log",
|
||||
"parking_lot",
|
||||
"paths",
|
||||
"prost",
|
||||
"release_channel",
|
||||
"rpc",
|
||||
@@ -9587,6 +9613,7 @@ dependencies = [
|
||||
"settings",
|
||||
"shellexpand 2.1.2",
|
||||
"smol",
|
||||
"sysinfo",
|
||||
"telemetry_events",
|
||||
"toml 0.8.19",
|
||||
"util",
|
||||
@@ -9662,7 +9689,7 @@ dependencies = [
|
||||
"h2 0.3.26",
|
||||
"http 0.2.12",
|
||||
"http-body 0.4.6",
|
||||
"hyper 0.14.30",
|
||||
"hyper 0.14.31",
|
||||
"hyper-tls",
|
||||
"ipnet",
|
||||
"js-sys",
|
||||
@@ -9967,9 +9994,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "runtimelib"
|
||||
version = "0.16.0"
|
||||
version = "0.19.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "263588fe9593333c4bfde258c9021fc64e766ea434e070c6b67c7100536d6499"
|
||||
checksum = "fe23ba9967355bbb1be2fb9a8e51bd239ffdf9c791fad5a9b765122ee2bde2e4"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"async-dispatcher",
|
||||
@@ -12092,6 +12119,7 @@ dependencies = [
|
||||
"serde_json_lenient",
|
||||
"serde_repr",
|
||||
"settings",
|
||||
"strum 0.25.0",
|
||||
"util",
|
||||
"uuid",
|
||||
]
|
||||
@@ -12122,7 +12150,6 @@ name = "theme_selector"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"client",
|
||||
"feature_flags",
|
||||
"fs",
|
||||
"fuzzy",
|
||||
"gpui",
|
||||
@@ -13104,9 +13131,9 @@ checksum = "52ea75f83c0137a9b98608359a5f1af8144876eb67bcb1ce837368e906a9f524"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-script"
|
||||
version = "0.5.6"
|
||||
version = "0.5.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd"
|
||||
checksum = "9fb421b350c9aff471779e262955939f565ec18b86c15364e6bdf0d662ca7c1f"
|
||||
|
||||
[[package]]
|
||||
name = "unicode-segmentation"
|
||||
@@ -13454,7 +13481,7 @@ dependencies = [
|
||||
"futures-util",
|
||||
"headers",
|
||||
"http 0.2.12",
|
||||
"hyper 0.14.30",
|
||||
"hyper 0.14.31",
|
||||
"log",
|
||||
"mime",
|
||||
"mime_guess",
|
||||
@@ -14750,6 +14777,7 @@ dependencies = [
|
||||
"settings",
|
||||
"smallvec",
|
||||
"sqlez",
|
||||
"strum 0.25.0",
|
||||
"task",
|
||||
"tempfile",
|
||||
"theme",
|
||||
@@ -15034,7 +15062,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "zed"
|
||||
version = "0.160.7"
|
||||
version = "0.161.1"
|
||||
dependencies = [
|
||||
"activity_indicator",
|
||||
"anyhow",
|
||||
@@ -15061,7 +15089,7 @@ dependencies = [
|
||||
"diagnostics",
|
||||
"editor",
|
||||
"env_logger 0.11.5",
|
||||
"extension",
|
||||
"extension_host",
|
||||
"extensions_ui",
|
||||
"feature_flags",
|
||||
"feedback",
|
||||
|
||||
@@ -90,13 +90,13 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zed-editor";
|
||||
version = "0.160.7";
|
||||
version = "0.161.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zed-industries";
|
||||
repo = "zed";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-mbBETOZVXTcfS+yGWPqEh+NEjo6UMTvk3XMghd8+s/s=";
|
||||
hash = "sha256-54yEp+HPaGLeWsnX5qn3+SalV0A6oc40ramJJ+g07RU=";
|
||||
};
|
||||
|
||||
patches =
|
||||
|
||||
@@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ngtcp2";
|
||||
version = "1.8.0";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ngtcp2";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-AIz4wQo5NimeSEKvk741abq2q3lyWpHz0kfU/PrOyYQ=";
|
||||
hash = "sha256-wNHaoZ6N9sJhsjlZEQ4iRHA3wvVxQE4cg8W2XeRx0LQ=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
buildPythonPackage,
|
||||
cryptography,
|
||||
fetchFromGitHub,
|
||||
@@ -30,6 +31,14 @@ buildPythonPackage rec {
|
||||
hash = "sha256-eVxpcYL3ZgwidkSt6tUav3Bkne4lo1QCshdUFqkA0wI=";
|
||||
};
|
||||
|
||||
# ModuleNotFoundError: No module named '_decimal'
|
||||
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
|
||||
grep -Rl 'from _decimal' tests/ | while read -r test_file; do
|
||||
substituteInPlace "$test_file" \
|
||||
--replace-fail 'from _decimal' 'from decimal'
|
||||
done
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
dependencies = [
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ha-philipsjs";
|
||||
version = "3.2.2";
|
||||
version = "3.3.3";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
@@ -23,7 +23,7 @@ buildPythonPackage rec {
|
||||
owner = "danielperna84";
|
||||
repo = "ha-philipsjs";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-zP8cuXdhvCDvnbc20GbFwgickdqeJ17b0vk0zK8ze9Q=";
|
||||
hash = "sha256-CQfT+jCICHjnldM7sjJN47dTD4WVkxfXmW5g80mnoTU=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "manim-slides";
|
||||
version = "5.1.8";
|
||||
version = "5.1.9";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.9";
|
||||
@@ -44,7 +44,7 @@ buildPythonPackage rec {
|
||||
owner = "jeertmans";
|
||||
repo = "manim-slides";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-0csCUJpIeq3EyER9gqiUgqrfHL9WSzX144Y0djL3dqQ=";
|
||||
hash = "sha256-M500u7x0jQqcqCd3RbS0CpI1nuwNs9URFlHPeGkiT7E=";
|
||||
};
|
||||
|
||||
build-system = [
|
||||
|
||||
@@ -46,8 +46,8 @@ let
|
||||
in
|
||||
rec {
|
||||
mypy-boto3-accessanalyzer =
|
||||
buildMypyBoto3Package "accessanalyzer" "1.35.0"
|
||||
"sha256-xqzlZtspREjzFnslOFdBOwgRuX7+/QhFY2pnvWdvZbg=";
|
||||
buildMypyBoto3Package "accessanalyzer" "1.35.60"
|
||||
"sha256-xXLkCWbh5JBL2Mt0KIIRQJEhfPeJrIafGf8edWdkwq8=";
|
||||
|
||||
mypy-boto3-account =
|
||||
buildMypyBoto3Package "account" "1.35.0"
|
||||
@@ -250,8 +250,8 @@ rec {
|
||||
"sha256-8QLyd1uCh26njr6VnNBFROHWFXMSvpO7WRzV8DFZ01U=";
|
||||
|
||||
mypy-boto3-cloudtrail =
|
||||
buildMypyBoto3Package "cloudtrail" "1.35.27"
|
||||
"sha256-EZzFE8myIt72X3Mxr+ZZ4lx8O+nTARvm93OhT4ekYpE=";
|
||||
buildMypyBoto3Package "cloudtrail" "1.35.60"
|
||||
"sha256-DuFNdYU7QrUczvCd1mU9jnPBkGfwpskj9F6gSYwJYnA=";
|
||||
|
||||
mypy-boto3-cloudtrail-data =
|
||||
buildMypyBoto3Package "cloudtrail-data" "1.35.0"
|
||||
@@ -434,8 +434,8 @@ rec {
|
||||
"sha256-OgK+ZM7wn7Elp6xzb1YnZtYP+eARgsP+BIYkQb+E4YE=";
|
||||
|
||||
mypy-boto3-dynamodb =
|
||||
buildMypyBoto3Package "dynamodb" "1.35.54"
|
||||
"sha256-qzd/6OxI0XBt8Z1s5bzlRbM27o/O1ZDfR98uqsH69sA=";
|
||||
buildMypyBoto3Package "dynamodb" "1.35.60"
|
||||
"sha256-kurDXEnp8/8jpK1t7l3FTkEODEmpi02TSTxwAOvnRWg=";
|
||||
|
||||
mypy-boto3-dynamodbstreams =
|
||||
buildMypyBoto3Package "dynamodbstreams" "1.35.0"
|
||||
@@ -446,8 +446,8 @@ rec {
|
||||
"sha256-wBJ7PnAlsi88AZIRPoNgbzOhPwUAJBegtwk+tw1lOwU=";
|
||||
|
||||
mypy-boto3-ec2 =
|
||||
buildMypyBoto3Package "ec2" "1.35.52"
|
||||
"sha256-nvj7AYDTPDNLpAOcWOl5vGbtfEscLDwhVHTdCtK9X5g=";
|
||||
buildMypyBoto3Package "ec2" "1.35.60"
|
||||
"sha256-vIA0qQ4Y8ScBw8e69DC51qrxPEDDZ7y2OTLGBX1hnRo=";
|
||||
|
||||
mypy-boto3-ec2-instance-connect =
|
||||
buildMypyBoto3Package "ec2-instance-connect" "1.35.0"
|
||||
@@ -630,8 +630,8 @@ rec {
|
||||
"sha256-jHZg5Y9hX7KinsiwNfwAs8bg8uO71JLIKFl6xDAQJwQ=";
|
||||
|
||||
mypy-boto3-internetmonitor =
|
||||
buildMypyBoto3Package "internetmonitor" "1.35.8"
|
||||
"sha256-BWNccaLrGmm5liiAOHCeFqSlkDk8wnj+/ipExaVZVis=";
|
||||
buildMypyBoto3Package "internetmonitor" "1.35.60"
|
||||
"sha256-499CCePEtUnJhk3GJJ/BWhpYY5smN91yp3WuSnYBXJo=";
|
||||
|
||||
mypy-boto3-iot =
|
||||
buildMypyBoto3Package "iot" "1.35.33"
|
||||
@@ -862,8 +862,8 @@ rec {
|
||||
"sha256-v+a4wc62OnHXJv5BHy/oq88FRn3piimmenmAPAOZXOA=";
|
||||
|
||||
mypy-boto3-mediaconvert =
|
||||
buildMypyBoto3Package "mediaconvert" "1.35.23"
|
||||
"sha256-TvkVif/foJUzw1tPg8l2Y81neHUfxeZ9aDKtaIYKyRg=";
|
||||
buildMypyBoto3Package "mediaconvert" "1.35.60"
|
||||
"sha256-iURmmne8xlDftE34C1f6EMIM0Ub10vL25isLU4Q6ROI=";
|
||||
|
||||
mypy-boto3-medialive =
|
||||
buildMypyBoto3Package "medialive" "1.35.23"
|
||||
@@ -986,8 +986,8 @@ rec {
|
||||
"sha256-qyUZN9Gz8Q6TBDg1LW+M58TLwDlmqJ9aCr4021LbSL0=";
|
||||
|
||||
mypy-boto3-organizations =
|
||||
buildMypyBoto3Package "organizations" "1.35.28"
|
||||
"sha256-lT/74MV0ZKA1rBoHOuZBM0uAf4/aOQ2V5AMxzGY5RFM=";
|
||||
buildMypyBoto3Package "organizations" "1.35.60"
|
||||
"sha256-xOhCq83c8jf6Nn4lLHiHidFtIk3qzBkCQ/NCV6vq7v0=";
|
||||
|
||||
mypy-boto3-osis =
|
||||
buildMypyBoto3Package "osis" "1.35.0"
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "oras";
|
||||
version = "0.2.2";
|
||||
version = "0.2.25";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "oras-project";
|
||||
repo = "oras-py";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-fylc6uKQs+jbssY8PRo/o4EnBxDcvupjEWmr5ypZbrY=";
|
||||
hash = "sha256-o9PSd5vZ5qllL73WPSlSaLA5QmKKLshGgfidiM4h+5g=";
|
||||
};
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pykoplenti";
|
||||
version = "1.2.2";
|
||||
version = "1.3.0";
|
||||
pyproject = true;
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@@ -22,7 +22,7 @@ buildPythonPackage rec {
|
||||
owner = "stegm";
|
||||
repo = "pykoplenti";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-2sGkHCIGo1lzLurvQBmq+16sodAaK8v+mAbIH/Gd3+E=";
|
||||
hash = "sha256-6edlcjQvV+6q3/ytn9KR/IovduVREEQt8foE2lfsBko=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [ "pydantic" ];
|
||||
|
||||
@@ -1,17 +0,0 @@
|
||||
# This file has been generated by node2nix 1.11.1. Do not edit!
|
||||
|
||||
{pkgs ? import <nixpkgs> {
|
||||
inherit system;
|
||||
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_18"}:
|
||||
|
||||
let
|
||||
nodeEnv = import ./node-env.nix {
|
||||
inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
|
||||
inherit pkgs nodejs;
|
||||
libtool = if pkgs.stdenv.hostPlatform.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
|
||||
};
|
||||
in
|
||||
import ./node-packages.nix {
|
||||
inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
|
||||
inherit nodeEnv;
|
||||
}
|
||||
@@ -1,18 +1,40 @@
|
||||
{ callPackage, fetchFromGitHub, lib, pkgs }:
|
||||
let
|
||||
nodePackages = import ./composition.nix { inherit pkgs; };
|
||||
sourceInfo = (lib.importJSON ./netlify-cli.json);
|
||||
in
|
||||
nodePackages.package.override {
|
||||
preRebuild = ''
|
||||
export ESBUILD_BINARY_PATH="${pkgs.esbuild_netlify}/bin/esbuild"
|
||||
'';
|
||||
src = fetchFromGitHub {
|
||||
inherit (sourceInfo) owner repo rev hash;
|
||||
};
|
||||
bypassCache = true;
|
||||
reconstructLock = true;
|
||||
passthru.tests.test = callPackage ./test.nix { };
|
||||
meta.maintainers = with lib.maintainers; [ roberth ];
|
||||
meta.mainProgram = "netlify";
|
||||
}
|
||||
{
|
||||
callPackage,
|
||||
vips,
|
||||
pkg-config,
|
||||
lib,
|
||||
buildNpmPackage,
|
||||
fetchFromGitHub,
|
||||
nix-update-script,
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "netlify-cli";
|
||||
version = "17.37.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "netlify";
|
||||
repo = "cli";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-34WvnbvLv2bB8CTlFKf351eQ5enYRhDqHoHRvJTBq4M=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-zbr8TVCIKa/x5vzc3bR++qDcu0AuAgq1rfE69rytCWw=";
|
||||
|
||||
buildInputs = [ vips ];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
passthru = {
|
||||
tests.test = callPackage ./test.nix { };
|
||||
updateScript = nix-update-script { };
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "Netlify command line tool";
|
||||
homepage = "https://github.com/netlify/cli";
|
||||
changelog = "https://github.com/netlify/cli/blob/v${version}/CHANGELOG.md";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ roberth ];
|
||||
mainProgram = "netlify";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
set -eu -o pipefail
|
||||
cd "$( dirname "${BASH_SOURCE[0]}" )"
|
||||
rm -f ./node-env.nix
|
||||
src="$(nix-build --expr 'let pkgs = import ../../../.. {}; meta = (pkgs.lib.importJSON ./netlify-cli.json); in pkgs.fetchFromGitHub { inherit (meta) owner repo rev hash; }')"
|
||||
echo $src
|
||||
node2nix \
|
||||
--input $src/package.json \
|
||||
--lock $src/npm-shrinkwrap.json \
|
||||
--output node-packages.nix \
|
||||
--composition composition.nix \
|
||||
--node-env node-env.nix \
|
||||
--nodejs-18 \
|
||||
;
|
||||
@@ -1,6 +0,0 @@
|
||||
{
|
||||
"owner": "netlify",
|
||||
"repo": "cli",
|
||||
"rev": "6c7e8c9a4db4e2e408f65e6098a194497944e306",
|
||||
"hash": "sha256-YMnQrurZDJtfeHBCIzy6vToGHnqtdRGvWFPX5RcWyPg="
|
||||
}
|
||||
@@ -1,689 +0,0 @@
|
||||
# This file originates from node2nix
|
||||
|
||||
{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}:
|
||||
|
||||
let
|
||||
# Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master
|
||||
utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux;
|
||||
|
||||
python = if nodejs ? python then nodejs.python else python2;
|
||||
|
||||
# Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise
|
||||
tarWrapper = runCommand "tarWrapper" {} ''
|
||||
mkdir -p $out/bin
|
||||
|
||||
cat > $out/bin/tar <<EOF
|
||||
#! ${stdenv.shell} -e
|
||||
$(type -p tar) "\$@" --warning=no-unknown-keyword --delay-directory-restore
|
||||
EOF
|
||||
|
||||
chmod +x $out/bin/tar
|
||||
'';
|
||||
|
||||
# Function that generates a TGZ file from a NPM project
|
||||
buildNodeSourceDist =
|
||||
{ name, version, src, ... }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "node-tarball-${name}-${version}";
|
||||
inherit src;
|
||||
buildInputs = [ nodejs ];
|
||||
buildPhase = ''
|
||||
export HOME=$TMPDIR
|
||||
tgzFile=$(npm pack | tail -n 1) # Hooks to the pack command will add output (https://docs.npmjs.com/misc/scripts)
|
||||
'';
|
||||
installPhase = ''
|
||||
mkdir -p $out/tarballs
|
||||
mv $tgzFile $out/tarballs
|
||||
mkdir -p $out/nix-support
|
||||
echo "file source-dist $out/tarballs/$tgzFile" >> $out/nix-support/hydra-build-products
|
||||
'';
|
||||
};
|
||||
|
||||
# Common shell logic
|
||||
installPackage = writeShellScript "install-package" ''
|
||||
installPackage() {
|
||||
local packageName=$1 src=$2
|
||||
|
||||
local strippedName
|
||||
|
||||
local DIR=$PWD
|
||||
cd $TMPDIR
|
||||
|
||||
unpackFile $src
|
||||
|
||||
# Make the base dir in which the target dependency resides first
|
||||
mkdir -p "$(dirname "$DIR/$packageName")"
|
||||
|
||||
if [ -f "$src" ]
|
||||
then
|
||||
# Figure out what directory has been unpacked
|
||||
packageDir="$(find . -maxdepth 1 -type d | tail -1)"
|
||||
|
||||
# Restore write permissions to make building work
|
||||
find "$packageDir" -type d -exec chmod u+x {} \;
|
||||
chmod -R u+w "$packageDir"
|
||||
|
||||
# Move the extracted tarball into the output folder
|
||||
mv "$packageDir" "$DIR/$packageName"
|
||||
elif [ -d "$src" ]
|
||||
then
|
||||
# Get a stripped name (without hash) of the source directory.
|
||||
# On old nixpkgs it's already set internally.
|
||||
if [ -z "$strippedName" ]
|
||||
then
|
||||
strippedName="$(stripHash $src)"
|
||||
fi
|
||||
|
||||
# Restore write permissions to make building work
|
||||
chmod -R u+w "$strippedName"
|
||||
|
||||
# Move the extracted directory into the output folder
|
||||
mv "$strippedName" "$DIR/$packageName"
|
||||
fi
|
||||
|
||||
# Change to the package directory to install dependencies
|
||||
cd "$DIR/$packageName"
|
||||
}
|
||||
'';
|
||||
|
||||
# Bundle the dependencies of the package
|
||||
#
|
||||
# Only include dependencies if they don't exist. They may also be bundled in the package.
|
||||
includeDependencies = {dependencies}:
|
||||
lib.optionalString (dependencies != []) (
|
||||
''
|
||||
mkdir -p node_modules
|
||||
cd node_modules
|
||||
''
|
||||
+ (lib.concatMapStrings (dependency:
|
||||
''
|
||||
if [ ! -e "${dependency.packageName}" ]; then
|
||||
${composePackage dependency}
|
||||
fi
|
||||
''
|
||||
) dependencies)
|
||||
+ ''
|
||||
cd ..
|
||||
''
|
||||
);
|
||||
|
||||
# Recursively composes the dependencies of a package
|
||||
composePackage = { name, packageName, src, dependencies ? [], ... }@args:
|
||||
builtins.addErrorContext "while evaluating node package '${packageName}'" ''
|
||||
installPackage "${packageName}" "${src}"
|
||||
${includeDependencies { inherit dependencies; }}
|
||||
cd ..
|
||||
${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
|
||||
'';
|
||||
|
||||
pinpointDependencies = {dependencies, production}:
|
||||
let
|
||||
pinpointDependenciesFromPackageJSON = writeTextFile {
|
||||
name = "pinpointDependencies.js";
|
||||
text = ''
|
||||
var fs = require('fs');
|
||||
var path = require('path');
|
||||
|
||||
function resolveDependencyVersion(location, name) {
|
||||
if(location == process.env['NIX_STORE']) {
|
||||
return null;
|
||||
} else {
|
||||
var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json");
|
||||
|
||||
if(fs.existsSync(dependencyPackageJSON)) {
|
||||
var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON));
|
||||
|
||||
if(dependencyPackageObj.name == name) {
|
||||
return dependencyPackageObj.version;
|
||||
}
|
||||
} else {
|
||||
return resolveDependencyVersion(path.resolve(location, ".."), name);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function replaceDependencies(dependencies) {
|
||||
if(typeof dependencies == "object" && dependencies !== null) {
|
||||
for(var dependency in dependencies) {
|
||||
var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency);
|
||||
|
||||
if(resolvedVersion === null) {
|
||||
process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n");
|
||||
} else {
|
||||
dependencies[dependency] = resolvedVersion;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* Read the package.json configuration */
|
||||
var packageObj = JSON.parse(fs.readFileSync('./package.json'));
|
||||
|
||||
/* Pinpoint all dependencies */
|
||||
replaceDependencies(packageObj.dependencies);
|
||||
if(process.argv[2] == "development") {
|
||||
replaceDependencies(packageObj.devDependencies);
|
||||
}
|
||||
else {
|
||||
packageObj.devDependencies = {};
|
||||
}
|
||||
replaceDependencies(packageObj.optionalDependencies);
|
||||
replaceDependencies(packageObj.peerDependencies);
|
||||
|
||||
/* Write the fixed package.json file */
|
||||
fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2));
|
||||
'';
|
||||
};
|
||||
in
|
||||
''
|
||||
node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"}
|
||||
|
||||
${lib.optionalString (dependencies != [])
|
||||
''
|
||||
if [ -d node_modules ]
|
||||
then
|
||||
cd node_modules
|
||||
${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies}
|
||||
cd ..
|
||||
fi
|
||||
''}
|
||||
'';
|
||||
|
||||
# Recursively traverses all dependencies of a package and pinpoints all
|
||||
# dependencies in the package.json file to the versions that are actually
|
||||
# being used.
|
||||
|
||||
pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args:
|
||||
''
|
||||
if [ -d "${packageName}" ]
|
||||
then
|
||||
cd "${packageName}"
|
||||
${pinpointDependencies { inherit dependencies production; }}
|
||||
cd ..
|
||||
${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
|
||||
fi
|
||||
'';
|
||||
|
||||
# Extract the Node.js source code which is used to compile packages with
|
||||
# native bindings
|
||||
nodeSources = runCommand "node-sources" {} ''
|
||||
tar --no-same-owner --no-same-permissions -xf ${nodejs.src}
|
||||
mv node-* $out
|
||||
'';
|
||||
|
||||
# Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty)
|
||||
addIntegrityFieldsScript = writeTextFile {
|
||||
name = "addintegrityfields.js";
|
||||
text = ''
|
||||
var fs = require('fs');
|
||||
var path = require('path');
|
||||
|
||||
function augmentDependencies(baseDir, dependencies) {
|
||||
for(var dependencyName in dependencies) {
|
||||
var dependency = dependencies[dependencyName];
|
||||
|
||||
// Open package.json and augment metadata fields
|
||||
var packageJSONDir = path.join(baseDir, "node_modules", dependencyName);
|
||||
var packageJSONPath = path.join(packageJSONDir, "package.json");
|
||||
|
||||
if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored
|
||||
console.log("Adding metadata fields to: "+packageJSONPath);
|
||||
var packageObj = JSON.parse(fs.readFileSync(packageJSONPath));
|
||||
|
||||
if(dependency.integrity) {
|
||||
packageObj["_integrity"] = dependency.integrity;
|
||||
} else {
|
||||
packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads.
|
||||
}
|
||||
|
||||
if(dependency.resolved) {
|
||||
packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided
|
||||
} else {
|
||||
packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories.
|
||||
}
|
||||
|
||||
if(dependency.from !== undefined) { // Adopt from property if one has been provided
|
||||
packageObj["_from"] = dependency.from;
|
||||
}
|
||||
|
||||
fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2));
|
||||
}
|
||||
|
||||
// Augment transitive dependencies
|
||||
if(dependency.dependencies !== undefined) {
|
||||
augmentDependencies(packageJSONDir, dependency.dependencies);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(fs.existsSync("./package-lock.json")) {
|
||||
var packageLock = JSON.parse(fs.readFileSync("./package-lock.json"));
|
||||
|
||||
if(![1, 2].includes(packageLock.lockfileVersion)) {
|
||||
process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n");
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
if(packageLock.dependencies !== undefined) {
|
||||
augmentDependencies(".", packageLock.dependencies);
|
||||
}
|
||||
}
|
||||
'';
|
||||
};
|
||||
|
||||
# Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes
|
||||
reconstructPackageLock = writeTextFile {
|
||||
name = "reconstructpackagelock.js";
|
||||
text = ''
|
||||
var fs = require('fs');
|
||||
var path = require('path');
|
||||
|
||||
var packageObj = JSON.parse(fs.readFileSync("package.json"));
|
||||
|
||||
var lockObj = {
|
||||
name: packageObj.name,
|
||||
version: packageObj.version,
|
||||
lockfileVersion: 2,
|
||||
requires: true,
|
||||
packages: {
|
||||
"": {
|
||||
name: packageObj.name,
|
||||
version: packageObj.version,
|
||||
license: packageObj.license,
|
||||
bin: packageObj.bin,
|
||||
dependencies: packageObj.dependencies,
|
||||
engines: packageObj.engines,
|
||||
optionalDependencies: packageObj.optionalDependencies
|
||||
}
|
||||
},
|
||||
dependencies: {}
|
||||
};
|
||||
|
||||
function augmentPackageJSON(filePath, packages, dependencies) {
|
||||
var packageJSON = path.join(filePath, "package.json");
|
||||
if(fs.existsSync(packageJSON)) {
|
||||
var packageObj = JSON.parse(fs.readFileSync(packageJSON));
|
||||
packages[filePath] = {
|
||||
version: packageObj.version,
|
||||
integrity: "sha1-000000000000000000000000000=",
|
||||
dependencies: packageObj.dependencies,
|
||||
engines: packageObj.engines,
|
||||
optionalDependencies: packageObj.optionalDependencies
|
||||
};
|
||||
dependencies[packageObj.name] = {
|
||||
version: packageObj.version,
|
||||
integrity: "sha1-000000000000000000000000000=",
|
||||
dependencies: {}
|
||||
};
|
||||
processDependencies(path.join(filePath, "node_modules"), packages, dependencies[packageObj.name].dependencies);
|
||||
}
|
||||
}
|
||||
|
||||
function processDependencies(dir, packages, dependencies) {
|
||||
if(fs.existsSync(dir)) {
|
||||
var files = fs.readdirSync(dir);
|
||||
|
||||
files.forEach(function(entry) {
|
||||
var filePath = path.join(dir, entry);
|
||||
var stats = fs.statSync(filePath);
|
||||
|
||||
if(stats.isDirectory()) {
|
||||
if(entry.substr(0, 1) == "@") {
|
||||
// When we encounter a namespace folder, augment all packages belonging to the scope
|
||||
var pkgFiles = fs.readdirSync(filePath);
|
||||
|
||||
pkgFiles.forEach(function(entry) {
|
||||
if(stats.isDirectory()) {
|
||||
var pkgFilePath = path.join(filePath, entry);
|
||||
augmentPackageJSON(pkgFilePath, packages, dependencies);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
augmentPackageJSON(filePath, packages, dependencies);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
processDependencies("node_modules", lockObj.packages, lockObj.dependencies);
|
||||
|
||||
fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2));
|
||||
'';
|
||||
};
|
||||
|
||||
# Script that links bins defined in package.json to the node_modules bin directory
|
||||
# NPM does not do this for top-level packages itself anymore as of v7
|
||||
linkBinsScript = writeTextFile {
|
||||
name = "linkbins.js";
|
||||
text = ''
|
||||
var fs = require('fs');
|
||||
var path = require('path');
|
||||
|
||||
var packageObj = JSON.parse(fs.readFileSync("package.json"));
|
||||
|
||||
var nodeModules = Array(packageObj.name.split("/").length).fill("..").join(path.sep);
|
||||
|
||||
if(packageObj.bin !== undefined) {
|
||||
fs.mkdirSync(path.join(nodeModules, ".bin"))
|
||||
|
||||
if(typeof packageObj.bin == "object") {
|
||||
Object.keys(packageObj.bin).forEach(function(exe) {
|
||||
if(fs.existsSync(packageObj.bin[exe])) {
|
||||
console.log("linking bin '" + exe + "'");
|
||||
fs.symlinkSync(
|
||||
path.join("..", packageObj.name, packageObj.bin[exe]),
|
||||
path.join(nodeModules, ".bin", exe)
|
||||
);
|
||||
}
|
||||
else {
|
||||
console.log("skipping non-existent bin '" + exe + "'");
|
||||
}
|
||||
})
|
||||
}
|
||||
else {
|
||||
if(fs.existsSync(packageObj.bin)) {
|
||||
console.log("linking bin '" + packageObj.bin + "'");
|
||||
fs.symlinkSync(
|
||||
path.join("..", packageObj.name, packageObj.bin),
|
||||
path.join(nodeModules, ".bin", packageObj.name.split("/").pop())
|
||||
);
|
||||
}
|
||||
else {
|
||||
console.log("skipping non-existent bin '" + packageObj.bin + "'");
|
||||
}
|
||||
}
|
||||
}
|
||||
else if(packageObj.directories !== undefined && packageObj.directories.bin !== undefined) {
|
||||
fs.mkdirSync(path.join(nodeModules, ".bin"))
|
||||
|
||||
fs.readdirSync(packageObj.directories.bin).forEach(function(exe) {
|
||||
if(fs.existsSync(path.join(packageObj.directories.bin, exe))) {
|
||||
console.log("linking bin '" + exe + "'");
|
||||
fs.symlinkSync(
|
||||
path.join("..", packageObj.name, packageObj.directories.bin, exe),
|
||||
path.join(nodeModules, ".bin", exe)
|
||||
);
|
||||
}
|
||||
else {
|
||||
console.log("skipping non-existent bin '" + exe + "'");
|
||||
}
|
||||
})
|
||||
}
|
||||
'';
|
||||
};
|
||||
|
||||
prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}:
|
||||
let
|
||||
forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com";
|
||||
in
|
||||
''
|
||||
# Pinpoint the versions of all dependencies to the ones that are actually being used
|
||||
echo "pinpointing versions of dependencies..."
|
||||
source $pinpointDependenciesScriptPath
|
||||
|
||||
# Patch the shebangs of the bundled modules to prevent them from
|
||||
# calling executables outside the Nix store as much as possible
|
||||
patchShebangs .
|
||||
|
||||
# Deploy the Node.js package by running npm install. Since the
|
||||
# dependencies have been provided already by ourselves, it should not
|
||||
# attempt to install them again, which is good, because we want to make
|
||||
# it Nix's responsibility. If it needs to install any dependencies
|
||||
# anyway (e.g. because the dependency parameters are
|
||||
# incomplete/incorrect), it fails.
|
||||
#
|
||||
# The other responsibilities of NPM are kept -- version checks, build
|
||||
# steps, postprocessing etc.
|
||||
|
||||
export HOME=$TMPDIR
|
||||
cd "${packageName}"
|
||||
runHook preRebuild
|
||||
|
||||
${lib.optionalString bypassCache ''
|
||||
${lib.optionalString reconstructLock ''
|
||||
if [ -f package-lock.json ]
|
||||
then
|
||||
echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!"
|
||||
echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!"
|
||||
rm package-lock.json
|
||||
else
|
||||
echo "No package-lock.json file found, reconstructing..."
|
||||
fi
|
||||
|
||||
node ${reconstructPackageLock}
|
||||
''}
|
||||
|
||||
node ${addIntegrityFieldsScript}
|
||||
''}
|
||||
|
||||
npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild
|
||||
|
||||
runHook postRebuild
|
||||
|
||||
if [ "''${dontNpmInstall-}" != "1" ]
|
||||
then
|
||||
# NPM tries to download packages even when they already exist if npm-shrinkwrap is used.
|
||||
rm -f npm-shrinkwrap.json
|
||||
|
||||
npm ${forceOfflineFlag} --nodedir=${nodeSources} --no-bin-links --ignore-scripts ${npmFlags} ${lib.optionalString production "--production"} install
|
||||
fi
|
||||
|
||||
# Link executables defined in package.json
|
||||
node ${linkBinsScript}
|
||||
'';
|
||||
|
||||
# Builds and composes an NPM package including all its dependencies
|
||||
buildNodePackage =
|
||||
{ name
|
||||
, packageName
|
||||
, version ? null
|
||||
, dependencies ? []
|
||||
, buildInputs ? []
|
||||
, production ? true
|
||||
, npmFlags ? ""
|
||||
, dontNpmInstall ? false
|
||||
, bypassCache ? false
|
||||
, reconstructLock ? false
|
||||
, preRebuild ? ""
|
||||
, dontStrip ? true
|
||||
, unpackPhase ? "true"
|
||||
, buildPhase ? "true"
|
||||
, meta ? {}
|
||||
, ... }@args:
|
||||
|
||||
let
|
||||
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ];
|
||||
in
|
||||
stdenv.mkDerivation ({
|
||||
name = "${name}${if version == null then "" else "-${version}"}";
|
||||
buildInputs = [ tarWrapper python nodejs ]
|
||||
++ lib.optional (stdenv.hostPlatform.isLinux) utillinux
|
||||
++ lib.optional (stdenv.hostPlatform.isDarwin) libtool
|
||||
++ buildInputs;
|
||||
|
||||
inherit nodejs;
|
||||
|
||||
inherit dontStrip; # Stripping may fail a build for some package deployments
|
||||
inherit dontNpmInstall preRebuild unpackPhase buildPhase;
|
||||
|
||||
compositionScript = composePackage args;
|
||||
pinpointDependenciesScript = pinpointDependenciesOfPackage args;
|
||||
|
||||
passAsFile = [ "compositionScript" "pinpointDependenciesScript" ];
|
||||
|
||||
installPhase = ''
|
||||
source ${installPackage}
|
||||
|
||||
# Create and enter a root node_modules/ folder
|
||||
mkdir -p $out/lib/node_modules
|
||||
cd $out/lib/node_modules
|
||||
|
||||
# Compose the package and all its dependencies
|
||||
source $compositionScriptPath
|
||||
|
||||
${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
|
||||
|
||||
# Create symlink to the deployed executable folder, if applicable
|
||||
if [ -d "$out/lib/node_modules/.bin" ]
|
||||
then
|
||||
ln -s $out/lib/node_modules/.bin $out/bin
|
||||
|
||||
# Fixup all executables
|
||||
ls $out/bin/* | while read i
|
||||
do
|
||||
file="$(readlink -f "$i")"
|
||||
chmod u+rwx "$file"
|
||||
if isScript "$file"
|
||||
then
|
||||
sed -i 's/\r$//' "$file" # convert crlf to lf
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
# Create symlinks to the deployed manual page folders, if applicable
|
||||
if [ -d "$out/lib/node_modules/${packageName}/man" ]
|
||||
then
|
||||
mkdir -p $out/share
|
||||
for dir in "$out/lib/node_modules/${packageName}/man/"*
|
||||
do
|
||||
mkdir -p $out/share/man/$(basename "$dir")
|
||||
for page in "$dir"/*
|
||||
do
|
||||
ln -s $page $out/share/man/$(basename "$dir")
|
||||
done
|
||||
done
|
||||
fi
|
||||
|
||||
# Run post install hook, if provided
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
# default to Node.js' platforms
|
||||
platforms = nodejs.meta.platforms;
|
||||
} // meta;
|
||||
} // extraArgs);
|
||||
|
||||
# Builds a node environment (a node_modules folder and a set of binaries)
|
||||
buildNodeDependencies =
|
||||
{ name
|
||||
, packageName
|
||||
, version ? null
|
||||
, src
|
||||
, dependencies ? []
|
||||
, buildInputs ? []
|
||||
, production ? true
|
||||
, npmFlags ? ""
|
||||
, dontNpmInstall ? false
|
||||
, bypassCache ? false
|
||||
, reconstructLock ? false
|
||||
, dontStrip ? true
|
||||
, unpackPhase ? "true"
|
||||
, buildPhase ? "true"
|
||||
, ... }@args:
|
||||
|
||||
let
|
||||
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
|
||||
in
|
||||
stdenv.mkDerivation ({
|
||||
name = "node-dependencies-${name}${if version == null then "" else "-${version}"}";
|
||||
|
||||
buildInputs = [ tarWrapper python nodejs ]
|
||||
++ lib.optional (stdenv.hostPlatform.isLinux) utillinux
|
||||
++ lib.optional (stdenv.hostPlatform.isDarwin) libtool
|
||||
++ buildInputs;
|
||||
|
||||
inherit dontStrip; # Stripping may fail a build for some package deployments
|
||||
inherit dontNpmInstall unpackPhase buildPhase;
|
||||
|
||||
includeScript = includeDependencies { inherit dependencies; };
|
||||
pinpointDependenciesScript = pinpointDependenciesOfPackage args;
|
||||
|
||||
passAsFile = [ "includeScript" "pinpointDependenciesScript" ];
|
||||
|
||||
installPhase = ''
|
||||
source ${installPackage}
|
||||
|
||||
mkdir -p $out/${packageName}
|
||||
cd $out/${packageName}
|
||||
|
||||
source $includeScriptPath
|
||||
|
||||
# Create fake package.json to make the npm commands work properly
|
||||
cp ${src}/package.json .
|
||||
chmod 644 package.json
|
||||
${lib.optionalString bypassCache ''
|
||||
if [ -f ${src}/package-lock.json ]
|
||||
then
|
||||
cp ${src}/package-lock.json .
|
||||
chmod 644 package-lock.json
|
||||
fi
|
||||
''}
|
||||
|
||||
# Go to the parent folder to make sure that all packages are pinpointed
|
||||
cd ..
|
||||
${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
|
||||
|
||||
${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }}
|
||||
|
||||
# Expose the executables that were installed
|
||||
cd ..
|
||||
${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
|
||||
|
||||
mv ${packageName} lib
|
||||
ln -s $out/lib/node_modules/.bin $out/bin
|
||||
'';
|
||||
} // extraArgs);
|
||||
|
||||
# Builds a development shell
|
||||
buildNodeShell =
|
||||
{ name
|
||||
, packageName
|
||||
, version ? null
|
||||
, src
|
||||
, dependencies ? []
|
||||
, buildInputs ? []
|
||||
, production ? true
|
||||
, npmFlags ? ""
|
||||
, dontNpmInstall ? false
|
||||
, bypassCache ? false
|
||||
, reconstructLock ? false
|
||||
, dontStrip ? true
|
||||
, unpackPhase ? "true"
|
||||
, buildPhase ? "true"
|
||||
, ... }@args:
|
||||
|
||||
let
|
||||
nodeDependencies = buildNodeDependencies args;
|
||||
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "unpackPhase" "buildPhase" ];
|
||||
in
|
||||
stdenv.mkDerivation ({
|
||||
name = "node-shell-${name}${if version == null then "" else "-${version}"}";
|
||||
|
||||
buildInputs = [ python nodejs ] ++ lib.optional (stdenv.hostPlatform.isLinux) utillinux ++ buildInputs;
|
||||
buildCommand = ''
|
||||
mkdir -p $out/bin
|
||||
cat > $out/bin/shell <<EOF
|
||||
#! ${stdenv.shell} -e
|
||||
$shellHook
|
||||
exec ${stdenv.shell}
|
||||
EOF
|
||||
chmod +x $out/bin/shell
|
||||
'';
|
||||
|
||||
# Provide the dependencies in a development shell through the NODE_PATH environment variable
|
||||
inherit nodeDependencies;
|
||||
shellHook = lib.optionalString (dependencies != []) ''
|
||||
export NODE_PATH=${nodeDependencies}/lib/node_modules
|
||||
export PATH="${nodeDependencies}/bin:$PATH"
|
||||
'';
|
||||
} // extraArgs);
|
||||
in
|
||||
{
|
||||
buildNodeSourceDist = lib.makeOverridable buildNodeSourceDist;
|
||||
buildNodePackage = lib.makeOverridable buildNodePackage;
|
||||
buildNodeDependencies = lib.makeOverridable buildNodeDependencies;
|
||||
buildNodeShell = lib.makeOverridable buildNodeShell;
|
||||
}
|
||||
-11931
File diff suppressed because it is too large
Load Diff
@@ -1,7 +0,0 @@
|
||||
{ pkgs ? import ../../../.. {} }:
|
||||
pkgs.mkShell {
|
||||
nativeBuildInputs = [
|
||||
pkgs.nodePackages.node2nix
|
||||
pkgs.nix-prefetch-github
|
||||
];
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -i bash
|
||||
set -euo pipefail
|
||||
mv netlify-cli.json{,.old}
|
||||
nix-prefetch-github-latest-release netlify cli >netlify-cli.json
|
||||
|
||||
if ! diff -U3 netlify-cli.json{.old,}; then
|
||||
echo New version detected\; generating expressions...
|
||||
./generate.sh
|
||||
fi
|
||||
rm -f netlify-cli.json.old
|
||||
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
|
||||
# Ensure that FUSE calls the setuid wrapper, not
|
||||
# $out/bin/fusermount. It falls back to calling fusermount in
|
||||
# $PATH, so it should also work on non-NixOS systems.
|
||||
NIX_CFLAGS_COMPILE = ''-DFUSERMOUNT_DIR="/run/wrappers/bin"'';
|
||||
env.NIX_CFLAGS_COMPILE = ''-DFUSERMOUNT_DIR="/run/wrappers/bin"'';
|
||||
|
||||
preConfigure =
|
||||
''
|
||||
|
||||
@@ -54,7 +54,7 @@ buildPostgresqlExtension (finalAttrs: {
|
||||
description = "PostgreSQL vector database extension for building AI applications";
|
||||
homepage = "https://lantern.dev/";
|
||||
changelog = "https://github.com/lanterndata/lantern/blob/${finalAttrs.src.rev}/CHANGELOG.md";
|
||||
license = licenses.bsl11;
|
||||
license = licenses.agpl3Only;
|
||||
maintainers = [ ];
|
||||
platforms = postgresql.meta.platforms;
|
||||
# error: use of undeclared identifier 'aligned_alloc'
|
||||
|
||||
Generated
+4090
-2001
File diff suppressed because it is too large
Load Diff
@@ -1,41 +1,43 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, pkg-config
|
||||
, cmake
|
||||
, openssl
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
, stdenv
|
||||
, Security
|
||||
, libiconv
|
||||
, protobuf
|
||||
{
|
||||
lib,
|
||||
rustPlatform,
|
||||
pkg-config,
|
||||
cmake,
|
||||
openssl,
|
||||
fetchFromGitHub,
|
||||
installShellFiles,
|
||||
stdenv,
|
||||
Security,
|
||||
libiconv,
|
||||
protobuf,
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "tremor";
|
||||
version = "0.12.4";
|
||||
version = "0.13.0-rc.33";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tremor-rs";
|
||||
repo = "tremor-runtime";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+cN+nMDMX4rxjs1VQnSgjBvCsjxxAd13otp9qd21SYo=";
|
||||
hash = "sha256-DoFqHKTu4CvgDYPT4vbwNvSZ/lNTdAF+wlHOOIBJKUw=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"http-client-6.5.1" = "sha256-IfFZSiNqN4kiro8qSR5HV7e0U3nadS2vaYtBF+7UPVs=";
|
||||
"qwal-0.1.0" = "sha256-PFdqRTNht77+/7GWzJm7/wESEaO3QjTTY+aRwpK9Ddo=";
|
||||
"rdkafka-0.28.0" = "sha256-6dUGf5TRtiGz9OCxcrPmLdhtZoOd/aJR9VgNFQC2tnQ=";
|
||||
"window-0.1.1" = "sha256-H6w1Y8ClhXISNYmALSRSwfREOaMzccNafygc6E44NYs=";
|
||||
};
|
||||
};
|
||||
cargoHash = "sha256-mgg6yzjRZsDbnK19nhNmy2I95tPWD4NmGCXtI957D0M=";
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config installShellFiles rustPlatform.bindgenHook ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
installShellFiles
|
||||
rustPlatform.bindgenHook
|
||||
];
|
||||
|
||||
buildInputs = [ openssl ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ Security libiconv ];
|
||||
buildInputs =
|
||||
[ openssl ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
Security
|
||||
libiconv
|
||||
];
|
||||
|
||||
# relax lints to fix an error caused by invalid macro_export
|
||||
# error: `log_error` isn't a valid `#[macro_export]` argument
|
||||
@@ -46,16 +48,18 @@ rustPlatform.buildRustPackage rec {
|
||||
'';
|
||||
|
||||
# TODO export TREMOR_PATH($out/lib) variable
|
||||
postInstall = ''
|
||||
# Copy the standard library to $out/lib
|
||||
cp -r ${src}/tremor-script/lib/ $out
|
||||
postInstall =
|
||||
''
|
||||
# Copy the standard library to $out/lib
|
||||
cp -r ${src}/tremor-script/lib/ $out
|
||||
|
||||
'' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd tremor \
|
||||
--bash <($out/bin/tremor completions bash) \
|
||||
--fish <($out/bin/tremor completions fish) \
|
||||
--zsh <($out/bin/tremor completions zsh)
|
||||
'';
|
||||
''
|
||||
+ lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
|
||||
installShellCompletion --cmd tremor \
|
||||
--bash <($out/bin/tremor completions bash) \
|
||||
--fish <($out/bin/tremor completions fish) \
|
||||
--zsh <($out/bin/tremor completions zsh)
|
||||
'';
|
||||
|
||||
# OPENSSL_NO_VENDOR - If set, always find OpenSSL in the system, even if the vendored feature is enabled.
|
||||
OPENSSL_NO_VENDOR = 1;
|
||||
@@ -91,6 +95,9 @@ rustPlatform.buildRustPackage rec {
|
||||
'';
|
||||
homepage = "https://www.tremor.rs/";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ humancalico happysalada ];
|
||||
maintainers = with maintainers; [
|
||||
humancalico
|
||||
happysalada
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user