Project import generated by Copybara.
GitOrigin-RevId: 6933d068c5d2fcff398e802f7c4e271bbdab6705
This commit is contained in:
Default email
parent
73b1e96727
commit
14a1eeff01
167 changed files with 9134 additions and 7553 deletions
14
third_party/nixpkgs/.github/CODEOWNERS
vendored
14
third_party/nixpkgs/.github/CODEOWNERS
vendored
|
|
@ -72,12 +72,14 @@
|
|||
/pkgs/common-updater/scripts/update-source-version @jtojnar
|
||||
|
||||
# Python-related code and docs
|
||||
/maintainers/scripts/update-python-libraries @FRidh
|
||||
/pkgs/top-level/python-packages.nix @FRidh @jonringer
|
||||
/pkgs/development/interpreters/python @FRidh
|
||||
/pkgs/development/python-modules @FRidh @jonringer
|
||||
/doc/languages-frameworks/python.section.md @FRidh
|
||||
/pkgs/development/tools/poetry2nix @adisbladis
|
||||
/maintainers/scripts/update-python-libraries @FRidh
|
||||
/pkgs/top-level/python-packages.nix @FRidh @jonringer
|
||||
/pkgs/development/interpreters/python @FRidh
|
||||
/pkgs/development/python-modules @FRidh @jonringer
|
||||
/doc/languages-frameworks/python.section.md @FRidh
|
||||
/pkgs/development/tools/poetry2nix @adisbladis
|
||||
/pkgs/development/interpreters/python/hooks @FRidh @jonringer @DavHau
|
||||
/pkgs/development/interpreters/python/conda @DavHau
|
||||
|
||||
# Haskell
|
||||
/doc/languages-frameworks/haskell.section.md @cdepillabout @sternenseemann @maralorn
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
name: Backport
|
||||
on:
|
||||
pull_request:
|
||||
types: [closed]
|
||||
pull_request_target:
|
||||
types: [closed, labeled]
|
||||
jobs:
|
||||
backport:
|
||||
name: Create backport PRs
|
||||
name: Backport Pull Request
|
||||
if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
|
|
@ -12,6 +12,7 @@ jobs:
|
|||
with:
|
||||
# required to find all branches
|
||||
fetch-depth: 0
|
||||
ref: ${{ github.event.pull_request.head.sha }}
|
||||
- name: Create backport PRs
|
||||
# should be kept in sync with `version`
|
||||
uses: zeebe-io/backport-action@9b8949dcd4295d364b0939f07d0c7593598d26cd
|
||||
|
|
|
|||
|
|
@ -526,6 +526,16 @@ If you do need to do create this sort of patch file, one way to do so is with gi
|
|||
$ git diff > nixpkgs/pkgs/the/package/0001-changes.patch
|
||||
```
|
||||
|
||||
If a patch is available online but does not cleanly apply, it can be modified in some fixed ways by using additional optional arguments for `fetchpatch`:
|
||||
|
||||
- `stripLen`: Remove the first `stripLen` components of pathnames in the patch.
|
||||
- `extraPrefix`: Prefix pathnames by this string.
|
||||
- `excludes`: Exclude files matching this pattern.
|
||||
- `includes`: Include only files matching this pattern.
|
||||
- `revert`: Revert the patch.
|
||||
|
||||
Note that because the checksum is computed after applying these effects, using or modifying these arguments will have no effect unless the `sha256` argument is changed as well.
|
||||
|
||||
## Package tests {#sec-package-tests}
|
||||
|
||||
Tests are important to ensure quality and make reviews and automatic updates easy.
|
||||
|
|
|
|||
|
|
@ -107,6 +107,54 @@ rustPlatform.buildRustPackage rec {
|
|||
}
|
||||
```
|
||||
|
||||
### Importing a `Cargo.lock` file
|
||||
|
||||
Using `cargoSha256` or `cargoHash` is tedious when using
|
||||
`buildRustPackage` within a project, since it requires that the hash
|
||||
is updated after every change to `Cargo.lock`. Therefore,
|
||||
`buildRustPackage` also supports vendoring dependencies directly from
|
||||
a `Cargo.lock` file using the `cargoLock` argument. For example:
|
||||
|
||||
```nix
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "myproject";
|
||||
version = "1.0.0";
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
}
|
||||
|
||||
# ...
|
||||
}
|
||||
```
|
||||
|
||||
This will retrieve the dependencies using fixed-output derivations from
|
||||
the specified lockfile.
|
||||
|
||||
The output hash of each dependency that uses a git source must be
|
||||
specified in the `outputHashes` attribute. For example:
|
||||
|
||||
```nix
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "myproject";
|
||||
version = "1.0.0";
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"finalfusion-0.14.0" = "17f4bsdzpcshwh74w5z119xjy2if6l2wgyjy56v621skr2r8y904";
|
||||
};
|
||||
}
|
||||
|
||||
# ...
|
||||
}
|
||||
```
|
||||
|
||||
If you do not specify an output hash for a git dependency, building
|
||||
the package will fail and inform you of which crate needs to be
|
||||
added. To find the correct hash, you can first use `lib.fakeSha256` or
|
||||
`lib.fakeHash` as a stub hash. Building the package (and thus the
|
||||
vendored dependencies) will then inform you of the correct hash.
|
||||
|
||||
### Cross compilation
|
||||
|
||||
|
|
@ -308,6 +356,37 @@ attributes can also be used:
|
|||
the `Cargo.lock`/`Cargo.toml` files need to be patched before
|
||||
vendoring.
|
||||
|
||||
If a `Cargo.lock` file is available, you can alternatively use the
|
||||
`importCargoLock` function. In contrast to `fetchCargoTarball`, this
|
||||
function does not require a hash (unless git dependencies are used)
|
||||
and fetches every dependency as a separate fixed-output derivation.
|
||||
`importCargoLock` can be used as follows:
|
||||
|
||||
```
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
lockFile = ./Cargo.lock;
|
||||
};
|
||||
```
|
||||
|
||||
If the `Cargo.lock` file includes git dependencies, then their output
|
||||
hashes need to be specified since they are not available through the
|
||||
lock file. For example:
|
||||
|
||||
```
|
||||
cargoDeps = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"rand-0.8.3" = "0ya2hia3cn31qa8894s3av2s8j5bjwb6yq92k0jsnlx7jid0jwqa";
|
||||
};
|
||||
};
|
||||
```
|
||||
|
||||
If you do not specify an output hash for a git dependency, building
|
||||
`cargoDeps` will fail and inform you of which crate needs to be
|
||||
added. To find the correct hash, you can first use `lib.fakeSha256` or
|
||||
`lib.fakeHash` as a stub hash. Building `cargoDeps` will then inform
|
||||
you of the correct hash.
|
||||
|
||||
### Hooks
|
||||
|
||||
`rustPlatform` provides the following hooks to automate Cargo builds:
|
||||
|
|
|
|||
|
|
@ -6615,6 +6615,16 @@
|
|||
githubId = 1387206;
|
||||
name = "Mike Sperber";
|
||||
};
|
||||
mikroskeem = {
|
||||
email = "mikroskeem@mikroskeem.eu";
|
||||
github = "mikroskeem";
|
||||
githubId = 3490861;
|
||||
name = "Mark Vainomaa";
|
||||
keys = [{
|
||||
longkeyid = "rsa4096/0xDA015B05B5A11B22";
|
||||
fingerprint = "DB43 2895 CF68 F0CE D4B7 EF60 DA01 5B05 B5A1 1B22";
|
||||
}];
|
||||
};
|
||||
milesbreslin = {
|
||||
email = "milesbreslin@gmail.com";
|
||||
github = "milesbreslin";
|
||||
|
|
@ -7175,6 +7185,12 @@
|
|||
githubId = 10180857;
|
||||
name = "Anmol Sethi";
|
||||
};
|
||||
nichtsfrei = {
|
||||
email = "philipp.eder@posteo.net";
|
||||
github = "nichtsfrei";
|
||||
githubId = 1665818;
|
||||
name = "Philipp Eder";
|
||||
};
|
||||
nickhu = {
|
||||
email = "me@nickhu.co.uk";
|
||||
github = "nickhu";
|
||||
|
|
@ -7463,6 +7479,12 @@
|
|||
githubId = 20923;
|
||||
name = "Erik Timan";
|
||||
};
|
||||
olebedev = {
|
||||
email = "ole6edev@gmail.com";
|
||||
github = "olebedev";
|
||||
githubId = 848535;
|
||||
name = "Oleg Lebedev";
|
||||
};
|
||||
olejorgenb = {
|
||||
email = "olejorgenb@yahoo.no";
|
||||
github = "olejorgenb";
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@
|
|||
</listitem>
|
||||
<listitem>
|
||||
<para>The default Linux kernel was updated to the 5.10 LTS series, coming from the 5.4 LTS series.</para>
|
||||
<para>The <package>linux_latest</package> kernel was updated to the 5.12 series. It currently is not officially supported for use with the zfs filesystem. If you use zfs, you should use a different kernel version (either the LTS kernel, or track a specific one). </para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>GNOME desktop environment was upgraded to 40, see the release notes for <link xlink:href="https://help.gnome.org/misc/release-notes/40.0/">40.0</link> and <link xlink:href="https://help.gnome.org/misc/release-notes/3.38/">3.38</link>. The <code>gnome3</code> attribute set has been renamed to <code>gnome</code> and so have been the NixOS options.</para>
|
||||
|
|
@ -305,6 +306,24 @@
|
|||
<literal>/var/lib/powerdns</literal> to <literal>/run/pdns</literal>.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>mediatomb</literal> service is
|
||||
now using by default the new and maintained fork
|
||||
<literal>gerbera</literal> package instead of the unmaintained
|
||||
<literal>mediatomb</literal> package. If you want to keep the old
|
||||
behavior, you must declare it with:
|
||||
<programlisting>
|
||||
services.mediatomb.package = pkgs.mediatomb;
|
||||
</programlisting>
|
||||
One new option <literal>openFirewall</literal> has been introduced which
|
||||
defaults to false. If you relied on the service declaration to add the
|
||||
firewall rules itself before, you should now declare it with:
|
||||
<programlisting>
|
||||
services.mediatomb.openFirewall = true;
|
||||
</programlisting>
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
xfsprogs was update from 4.19 to 5.11. It now enables reflink support by default on filesystem creation.
|
||||
|
|
@ -844,6 +863,29 @@ environment.systemPackages = [
|
|||
All services should use <xref linkend="opt-systemd.services._name_.startLimitIntervalSec" /> or <literal>StartLimitIntervalSec</literal> in <xref linkend="opt-systemd.services._name_.unitConfig" /> instead.
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The <literal>mediatomb</literal> service
|
||||
declares new options. It also adapts existing options so the
|
||||
configuration generation is now lazy. The existing option
|
||||
<literal>customCfg</literal> (defaults to false), when enabled, stops
|
||||
the service configuration generation completely. It then expects the
|
||||
users to provide their own correct configuration at the right location
|
||||
(whereas the configuration was generated and not used at all before).
|
||||
The new option <literal>transcodingOption</literal> (defaults to no)
|
||||
allows a generated configuration. It makes the mediatomb service pulls
|
||||
the necessary runtime dependencies in the nix store (whereas it was
|
||||
generated with hardcoded values before). The new option
|
||||
<literal>mediaDirectories</literal> allows the users to declare autoscan
|
||||
media directories from their nixos configuration:
|
||||
<programlisting>
|
||||
services.mediatomb.mediaDirectories = [
|
||||
{ path = "/var/lib/mediatomb/pictures"; recursive = false; hidden-files = false; }
|
||||
{ path = "/var/lib/mediatomb/audio"; recursive = true; hidden-files = false; }
|
||||
];
|
||||
</programlisting>
|
||||
</para>
|
||||
</listitem>
|
||||
<listitem>
|
||||
<para>
|
||||
The Unbound DNS resolver service (<literal>services.unbound</literal>) has been refactored to allow reloading, control sockets and to fix startup ordering issues.
|
||||
|
|
|
|||
|
|
@ -54,11 +54,13 @@ in
|
|||
};
|
||||
};
|
||||
|
||||
users.users.duplicati = lib.optionalAttrs (cfg.user == "duplicati") {
|
||||
uid = config.ids.uids.duplicati;
|
||||
home = "/var/lib/duplicati";
|
||||
createHome = true;
|
||||
group = "duplicati";
|
||||
users.users = lib.optionalAttrs (cfg.user == "duplicati") {
|
||||
duplicati = {
|
||||
uid = config.ids.uids.duplicati;
|
||||
home = "/var/lib/duplicati";
|
||||
createHome = true;
|
||||
group = "duplicati";
|
||||
};
|
||||
};
|
||||
users.groups.duplicati.gid = config.ids.gids.duplicati;
|
||||
|
||||
|
|
|
|||
|
|
@ -244,17 +244,6 @@ let
|
|||
|
||||
};
|
||||
|
||||
generatePathUnit = name: values:
|
||||
assert (values.privateKey == null);
|
||||
assert (values.privateKeyFile != null);
|
||||
nameValuePair "wireguard-${name}"
|
||||
{
|
||||
description = "WireGuard Tunnel - ${name} - Private Key";
|
||||
requiredBy = [ "wireguard-${name}.service" ];
|
||||
before = [ "wireguard-${name}.service" ];
|
||||
pathConfig.PathExists = values.privateKeyFile;
|
||||
};
|
||||
|
||||
generateKeyServiceUnit = name: values:
|
||||
assert values.generatePrivateKeyFile;
|
||||
nameValuePair "wireguard-${name}-key"
|
||||
|
|
@ -509,9 +498,6 @@ in
|
|||
// (mapAttrs' generateKeyServiceUnit
|
||||
(filterAttrs (name: value: value.generatePrivateKeyFile) cfg.interfaces));
|
||||
|
||||
systemd.paths = mapAttrs' generatePathUnit
|
||||
(filterAttrs (name: value: value.privateKeyFile != null) cfg.interfaces);
|
||||
|
||||
});
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,11 +5,16 @@ let
|
|||
|
||||
cfg = config.services.discourse;
|
||||
|
||||
# Keep in sync with https://github.com/discourse/discourse_docker/blob/master/image/base/Dockerfile#L5
|
||||
upstreamPostgresqlVersion = lib.getVersion pkgs.postgresql_13;
|
||||
|
||||
postgresqlPackage = if config.services.postgresql.enable then
|
||||
config.services.postgresql.package
|
||||
else
|
||||
pkgs.postgresql;
|
||||
|
||||
postgresqlVersion = lib.getVersion postgresqlPackage;
|
||||
|
||||
# We only want to create a database if we're actually going to connect to it.
|
||||
databaseActuallyCreateLocally = cfg.database.createLocally && cfg.database.host == null;
|
||||
|
||||
|
|
@ -263,6 +268,17 @@ in
|
|||
Discourse database user.
|
||||
'';
|
||||
};
|
||||
|
||||
ignorePostgresqlVersion = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Whether to allow other versions of PostgreSQL than the
|
||||
recommended one. Only effective when
|
||||
<option>services.discourse.database.createLocally</option>
|
||||
is enabled.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
redis = {
|
||||
|
|
@ -398,6 +414,14 @@ in
|
|||
How OpenSSL checks the certificate, see http://api.rubyonrails.org/classes/ActionMailer/Base.html
|
||||
'';
|
||||
};
|
||||
|
||||
forceTLS = lib.mkOption {
|
||||
type = lib.types.bool;
|
||||
default = false;
|
||||
description = ''
|
||||
Force implicit TLS as per RFC 8314 3.3.
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
incoming = {
|
||||
|
|
@ -497,6 +521,12 @@ in
|
|||
assertion = cfg.hostname != "";
|
||||
message = "Could not automatically determine hostname, set service.discourse.hostname manually.";
|
||||
}
|
||||
{
|
||||
assertion = cfg.database.ignorePostgresqlVersion || (databaseActuallyCreateLocally -> upstreamPostgresqlVersion == postgresqlVersion);
|
||||
message = "The PostgreSQL version recommended for use with Discourse is ${upstreamPostgresqlVersion}, you're using ${postgresqlVersion}. "
|
||||
+ "Either update your PostgreSQL package to the correct version or set services.discourse.database.ignorePostgresqlVersion. "
|
||||
+ "See https://nixos.org/manual/nixos/stable/index.html#module-postgresql for details on how to upgrade PostgreSQL.";
|
||||
}
|
||||
];
|
||||
|
||||
|
||||
|
|
@ -530,6 +560,7 @@ in
|
|||
smtp_authentication = cfg.mail.outgoing.authentication;
|
||||
smtp_enable_start_tls = cfg.mail.outgoing.enableStartTLSAuto;
|
||||
smtp_openssl_verify_mode = cfg.mail.outgoing.opensslVerifyMode;
|
||||
smtp_force_tls = cfg.mail.outgoing.forceTLS;
|
||||
|
||||
load_mini_profiler = true;
|
||||
mini_profiler_snapshots_period = 0;
|
||||
|
|
@ -542,8 +573,8 @@ in
|
|||
|
||||
redis_host = cfg.redis.host;
|
||||
redis_port = 6379;
|
||||
redis_slave_host = null;
|
||||
redis_slave_port = 6379;
|
||||
redis_replica_host = null;
|
||||
redis_replica_port = 6379;
|
||||
redis_db = cfg.redis.dbNumber;
|
||||
redis_password = cfg.redis.passwordFile;
|
||||
redis_skip_client_commands = false;
|
||||
|
|
@ -552,8 +583,8 @@ in
|
|||
message_bus_redis_enabled = false;
|
||||
message_bus_redis_host = "localhost";
|
||||
message_bus_redis_port = 6379;
|
||||
message_bus_redis_slave_host = null;
|
||||
message_bus_redis_slave_port = 6379;
|
||||
message_bus_redis_replica_host = null;
|
||||
message_bus_redis_replica_port = 6379;
|
||||
message_bus_redis_db = 0;
|
||||
message_bus_redis_password = null;
|
||||
message_bus_redis_skip_client_commands = false;
|
||||
|
|
@ -606,6 +637,7 @@ in
|
|||
allowed_theme_repos = null;
|
||||
enable_email_sync_demon = false;
|
||||
max_digests_enqueued_per_30_mins_per_site = 10000;
|
||||
cluster_name = null;
|
||||
};
|
||||
|
||||
services.redis.enable = lib.mkDefault (cfg.redis.host == "localhost");
|
||||
|
|
@ -667,6 +699,7 @@ in
|
|||
environment = cfg.package.runtimeEnv // {
|
||||
UNICORN_TIMEOUT = builtins.toString cfg.unicornTimeout;
|
||||
UNICORN_SIDEKIQS = builtins.toString cfg.sidekiqProcesses;
|
||||
MALLOC_ARENA_MAX = "2";
|
||||
};
|
||||
|
||||
preStart =
|
||||
|
|
|
|||
|
|
@ -56,6 +56,12 @@ let
|
|||
'';
|
||||
|
||||
flashbackEnabled = cfg.flashback.enableMetacity || length cfg.flashback.customSessions > 0;
|
||||
flashbackWms = optional cfg.flashback.enableMetacity {
|
||||
wmName = "metacity";
|
||||
wmLabel = "Metacity";
|
||||
wmCommand = "${pkgs.gnome.metacity}/bin/metacity";
|
||||
enableGnomePanel = true;
|
||||
} ++ cfg.flashback.customSessions;
|
||||
|
||||
notExcluded = pkg: mkDefault (!(lib.elem pkg config.environment.gnome.excludePackages));
|
||||
|
||||
|
|
@ -222,14 +228,14 @@ in
|
|||
type = types.listOf (types.submodule {
|
||||
options = {
|
||||
wmName = mkOption {
|
||||
type = types.str;
|
||||
description = "The filename-compatible name of the window manager to use.";
|
||||
type = types.strMatching "[a-zA-Z0-9_-]+";
|
||||
description = "A unique identifier for the window manager.";
|
||||
example = "xmonad";
|
||||
};
|
||||
|
||||
wmLabel = mkOption {
|
||||
type = types.str;
|
||||
description = "The pretty name of the window manager to use.";
|
||||
description = "The name of the window manager to show in the session chooser.";
|
||||
example = "XMonad";
|
||||
};
|
||||
|
||||
|
|
@ -238,6 +244,13 @@ in
|
|||
description = "The executable of the window manager to use.";
|
||||
example = "\${pkgs.haskellPackages.xmonad}/bin/xmonad";
|
||||
};
|
||||
|
||||
enableGnomePanel = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
example = "false";
|
||||
description = "Whether to enable the GNOME panel in this session.";
|
||||
};
|
||||
};
|
||||
});
|
||||
default = [];
|
||||
|
|
@ -295,14 +308,18 @@ in
|
|||
})
|
||||
|
||||
(mkIf flashbackEnabled {
|
||||
services.xserver.displayManager.sessionPackages = map
|
||||
(wm: pkgs.gnome.gnome-flashback.mkSessionForWm {
|
||||
inherit (wm) wmName wmLabel wmCommand;
|
||||
}) (optional cfg.flashback.enableMetacity {
|
||||
wmName = "metacity";
|
||||
wmLabel = "Metacity";
|
||||
wmCommand = "${pkgs.gnome.metacity}/bin/metacity";
|
||||
} ++ cfg.flashback.customSessions);
|
||||
services.xserver.displayManager.sessionPackages =
|
||||
let
|
||||
wmNames = map (wm: wm.wmName) flashbackWms;
|
||||
namesAreUnique = lib.unique wmNames == wmNames;
|
||||
in
|
||||
assert (assertMsg namesAreUnique "Flashback WM names must be unique.");
|
||||
map
|
||||
(wm:
|
||||
pkgs.gnome.gnome-flashback.mkSessionForWm {
|
||||
inherit (wm) wmName wmLabel wmCommand enableGnomePanel;
|
||||
}
|
||||
) flashbackWms;
|
||||
|
||||
security.pam.services.gnome-flashback = {
|
||||
enableGnomeKeyring = true;
|
||||
|
|
@ -310,15 +327,12 @@ in
|
|||
|
||||
systemd.packages = with pkgs.gnome; [
|
||||
gnome-flashback
|
||||
] ++ (map
|
||||
(wm: gnome-flashback.mkSystemdTargetForWm {
|
||||
inherit (wm) wmName;
|
||||
}) cfg.flashback.customSessions);
|
||||
] ++ map gnome-flashback.mkSystemdTargetForWm flashbackWms;
|
||||
|
||||
# gnome-panel needs these for menu applet
|
||||
environment.sessionVariables.XDG_DATA_DIRS = [ "${pkgs.gnome.gnome-flashback}/share" ];
|
||||
# TODO: switch to sessionVariables (resolve conflict)
|
||||
environment.variables.XDG_CONFIG_DIRS = [ "${pkgs.gnome.gnome-flashback}/etc/xdg" ];
|
||||
# gnome-panel needs these for menu applet
|
||||
environment.sessionVariables.XDG_DATA_DIRS = [ "${pkgs.gnome.gnome-flashback}/share" ];
|
||||
# TODO: switch to sessionVariables (resolve conflict)
|
||||
environment.variables.XDG_CONFIG_DIRS = [ "${pkgs.gnome.gnome-flashback}/etc/xdg" ];
|
||||
})
|
||||
|
||||
(mkIf serviceCfg.core-os-services.enable {
|
||||
|
|
|
|||
|
|
@ -120,6 +120,7 @@
|
|||
wmName = "xmonad";
|
||||
wmLabel = "XMonad";
|
||||
wmCommand = "${pkgs.haskellPackages.xmonad}/bin/xmonad";
|
||||
enableGnomePanel = false;
|
||||
}
|
||||
];
|
||||
</programlisting>
|
||||
|
|
|
|||
|
|
@ -51,6 +51,8 @@ import ./make-test-python.nix (
|
|||
|
||||
environment.systemPackages = [ pkgs.jq ];
|
||||
|
||||
services.postgresql.package = pkgs.postgresql_13;
|
||||
|
||||
services.discourse = {
|
||||
enable = true;
|
||||
inherit admin;
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "BJumblr";
|
||||
version = "1.4.2";
|
||||
version = "1.6.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sjaehn";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0kl6hrxmqrdf0195bfnzsa2h1073fgiqrfhg2276fm1954sm994v";
|
||||
sha256 = "1nbxi54023vck3qgmr385cjzinmdnvz62ywb6bcksmc3shl080mg";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -5,14 +5,14 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "helio-workstation";
|
||||
version = "3.4";
|
||||
version = "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "helio-fm";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-zXsDu/xi7OV6VtnZK9ZJ8uwPeA5uTgNpAQsqe90iwG4=";
|
||||
sha256 = "sha256-qW39g6rQ5VPQ3Hx9NmwLbpZiITnzFZDZlcLkE+pJKPc=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
43
third_party/nixpkgs/pkgs/applications/audio/quadrafuzz/default.nix
vendored
Normal file
43
third_party/nixpkgs/pkgs/applications/audio/quadrafuzz/default.nix
vendored
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
{ stdenv, lib, fetchFromGitHub, boost, cairo, lv2, pkg-config }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "quadrafuzz";
|
||||
version = "0.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jpcima";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1kjsf7il9krihwlrq08gk2xvil4b4q5zd87nnm103hby2w7ws7z1";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs ./dpf/utils/generate-ttl.sh
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [
|
||||
boost cairo lv2
|
||||
];
|
||||
|
||||
makeFlags = [
|
||||
"PREFIX=$(out)"
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
mkdir -p $out/lib/lv2
|
||||
cp -r bin/quadrafuzz.lv2/ $out/lib/lv2
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/jpcima/quadrafuzz";
|
||||
description = "Multi-band fuzz distortion plugin";
|
||||
maintainers = [ maintainers.magnetophon ];
|
||||
platforms = platforms.linux;
|
||||
license = licenses.gpl3Plus;
|
||||
};
|
||||
}
|
||||
32
third_party/nixpkgs/pkgs/applications/audio/rymcast/default.nix
vendored
Normal file
32
third_party/nixpkgs/pkgs/applications/audio/rymcast/default.nix
vendored
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{ lib, stdenv, fetchzip, autoPatchelfHook, makeWrapper
|
||||
, alsaLib, curl, gtk3, webkitgtk, zenity }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rymcast";
|
||||
version = "1.0.6";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://www.inphonik.com/files/rymcast/rymcast-${version}-linux-x64.tar.gz";
|
||||
hash = "sha256:0vjjhfrwdibjjgz3awbg30qxkjrzc4cya1f4pigwjh3r0vvrq0ga";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
|
||||
|
||||
buildInputs = [ alsaLib curl gtk3 stdenv.cc.cc.lib webkitgtk zenity ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out/bin"
|
||||
cp RYMCast "$out/bin/"
|
||||
wrapProgram "$out/bin/RYMCast" \
|
||||
--set PATH "${lib.makeBinPath [ zenity ]}"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Player for Mega Drive/Genesis VGM files";
|
||||
homepage = "https://www.inphonik.com/products/rymcast-genesis-vgm-player/";
|
||||
license = licenses.unfree;
|
||||
platforms = [ "x86_64-linux" ];
|
||||
maintainers = with maintainers; [ astsmtl ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,7 +1,17 @@
|
|||
{ lib, fetchFromGitHub, python3, cdparanoia, cdrdao, flac
|
||||
, sox, accuraterip-checksum, libsndfile, util-linux, substituteAll }:
|
||||
{ lib
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, libcdio-paranoia
|
||||
, cdrdao
|
||||
, libsndfile
|
||||
, flac
|
||||
, sox
|
||||
, util-linux
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
let
|
||||
bins = [ libcdio-paranoia cdrdao flac sox util-linux ];
|
||||
in python3.pkgs.buildPythonApplication rec {
|
||||
pname = "whipper";
|
||||
version = "0.10.0";
|
||||
|
||||
|
|
@ -12,44 +22,43 @@ python3.pkgs.buildPythonApplication rec {
|
|||
sha256 = "00cq03cy5dyghmibsdsq5sdqv3bzkzhshsng74bpnb5lasxp3ia5";
|
||||
};
|
||||
|
||||
pythonPath = with python3.pkgs; [
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
setuptools_scm
|
||||
docutils
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
musicbrainzngs
|
||||
mutagen
|
||||
pycdio
|
||||
pygobject3
|
||||
requests
|
||||
ruamel_yaml
|
||||
setuptools
|
||||
setuptools_scm
|
||||
discid
|
||||
pillow
|
||||
];
|
||||
|
||||
buildInputs = [ libsndfile ];
|
||||
|
||||
checkInputs = with python3.pkgs; [
|
||||
twisted
|
||||
];
|
||||
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./paths.patch;
|
||||
inherit cdparanoia;
|
||||
})
|
||||
];
|
||||
] ++ bins;
|
||||
|
||||
makeWrapperArgs = [
|
||||
"--prefix" "PATH" ":" (lib.makeBinPath [ accuraterip-checksum cdrdao util-linux flac sox ])
|
||||
"--prefix" "PATH" ":" (lib.makeBinPath bins)
|
||||
];
|
||||
|
||||
preBuild = ''
|
||||
export SETUPTOOLS_SCM_PRETEND_VERSION="${version}"
|
||||
'';
|
||||
|
||||
# some tests require internet access
|
||||
# https://github.com/JoeLametta/whipper/issues/291
|
||||
doCheck = false;
|
||||
|
||||
preCheck = ''
|
||||
HOME=$TMPDIR
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
# disable tests that require internet access
|
||||
# https://github.com/JoeLametta/whipper/issues/291
|
||||
substituteInPlace whipper/test/test_common_accurip.py \
|
||||
--replace "test_AccurateRipResponse" "dont_test_AccurateRipResponse"
|
||||
HOME=$TMPDIR ${python3.interpreter} -m unittest discover
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
--- a/whipper/program/cdparanoia.py
|
||||
+++ b/whipper/program/cdparanoia.py
|
||||
@@ -280,10 +280,10 @@
|
||||
|
||||
bufsize = 1024
|
||||
if self._overread:
|
||||
- argv = ["cd-paranoia", "--stderr-progress",
|
||||
+ argv = ["@cdparanoia@/bin/cdparanoia", "--stderr-progress",
|
||||
"--sample-offset=%d" % self._offset, "--force-overread", ]
|
||||
else:
|
||||
- argv = ["cd-paranoia", "--stderr-progress",
|
||||
+ argv = ["@cdparanoia@/bin/cdparanoia", "--stderr-progress",
|
||||
"--sample-offset=%d" % self._offset, ]
|
||||
if self._device:
|
||||
argv.extend(["--force-cdrom-device", self._device, ])
|
||||
@@ -560,7 +560,7 @@
|
||||
|
||||
def getCdParanoiaVersion():
|
||||
getter = common.VersionGetter('cd-paranoia',
|
||||
- ["cd-paranoia", "-V"],
|
||||
+ ["@cdparanoia@/bin/cdparanoia", "-V"],
|
||||
_VERSION_RE,
|
||||
"%(version)s %(release)s")
|
||||
|
||||
@@ -585,7 +585,7 @@
|
||||
def __init__(self, device=None):
|
||||
# cdparanoia -A *always* writes cdparanoia.log
|
||||
self.cwd = tempfile.mkdtemp(suffix='.whipper.cache')
|
||||
- self.command = ['cd-paranoia', '-A']
|
||||
+ self.command = ['@cdparanoia@/bin/cdparanoia', '-A']
|
||||
if device:
|
||||
self.command += ['-d', device]
|
||||
|
|
@ -24,7 +24,7 @@ let
|
|||
six
|
||||
];
|
||||
in mkDerivation rec {
|
||||
version = "3.16.6";
|
||||
version = "3.16.7";
|
||||
pname = "qgis";
|
||||
name = "${pname}-unwrapped-${version}";
|
||||
|
||||
|
|
@ -32,7 +32,7 @@ in mkDerivation rec {
|
|||
owner = "qgis";
|
||||
repo = "QGIS";
|
||||
rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
|
||||
sha256 = "1vnz5kiyjircmhn4vq3fa5j2kvkxpwcsry7jc6nxl0w0dqx1zay1";
|
||||
sha256 = "0yvb2w83dplh0my72xljglq9a4a7qkfliwslav26lw4yqxr8mr0p";
|
||||
};
|
||||
|
||||
passthru = {
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "qmapshack";
|
||||
version = "1.15.2";
|
||||
version = "1.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Maproom";
|
||||
repo = pname;
|
||||
rev = "V_${version}";
|
||||
sha256 = "1l1j2axf94pdqwirwwhwy3y6k8v1aix78ifqbv6j8sv131h2j7y7";
|
||||
sha256 = "1yzgkdjxwyg8ggbxyjwr0zjrx99ckrbz2p2524iii9i7qqn8wfsx";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
@ -20,13 +20,6 @@ mkDerivation rec {
|
|||
"-DROUTINO_XML_PATH=${routino}/share/routino"
|
||||
];
|
||||
|
||||
patches = [
|
||||
"${src}/FindPROJ4.patch"
|
||||
|
||||
# Support QuaZip 1.x.
|
||||
./pr350-support-quazip-1x.patch
|
||||
];
|
||||
|
||||
qtWrapperArgs = [
|
||||
"--suffix PATH : ${lib.makeBinPath [ gdal routino ]}"
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,141 +0,0 @@
|
|||
From 8fb751c656a14020ba37fb91b7f7cba3c49d8504 Mon Sep 17 00:00:00 2001
|
||||
From: kiozen <oliver.eichler@gmx.de>
|
||||
Date: Sat, 20 Mar 2021 12:14:29 +0100
|
||||
Subject: [PATCH] [QMS-349] Upgrade to Quazip Qt5 V1.x
|
||||
|
||||
Simply adjusted the cmake scripts
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
src/qmapshack/CMakeLists.txt | 27 +++++++++++++--------------
|
||||
3 files changed, 15 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 8d2cf127..7420d9b2 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -152,7 +152,7 @@ find_package(GDAL REQUIRED)
|
||||
find_package(PROJ REQUIRED)
|
||||
find_package(JPEG REQUIRED)
|
||||
find_package(ROUTINO REQUIRED)
|
||||
-find_package(QuaZip5 REQUIRED)
|
||||
+find_package(QuaZip-Qt5 REQUIRED)
|
||||
find_package(ALGLIB ) # optional as we can use our local version
|
||||
|
||||
|
||||
diff --git a/src/qmapshack/CMakeLists.txt b/src/qmapshack/CMakeLists.txt
|
||||
index 08eeb183..9b3836d6 100644
|
||||
--- a/src/qmapshack/CMakeLists.txt
|
||||
+++ b/src/qmapshack/CMakeLists.txt
|
||||
@@ -22,8 +22,8 @@ add_definitions(-DROUTINO_XML_PATH=${ROUTINO_XML_PATH})
|
||||
# All source files needed to compile
|
||||
###############################################################################################
|
||||
|
||||
-set( SRCS
|
||||
- CAbout.cpp
|
||||
+set( SRCS
|
||||
+ CAbout.cpp
|
||||
CMainWindow.cpp
|
||||
CSingleInstanceProxy.cpp
|
||||
canvas/CCanvas.cpp
|
||||
@@ -160,7 +160,7 @@ set( SRCS
|
||||
gis/trk/CInvalidTrk.cpp
|
||||
gis/trk/CKnownExtension.cpp
|
||||
gis/trk/CListTrkPts.cpp
|
||||
- gis/trk/CPropertyTrk.cpp
|
||||
+ gis/trk/CPropertyTrk.cpp
|
||||
gis/trk/CScrOptTrk.cpp
|
||||
gis/trk/CSelectActivityColor.cpp
|
||||
gis/trk/CTableTrk.cpp
|
||||
@@ -272,7 +272,7 @@ set( SRCS
|
||||
mouse/line/CLineOpMovePoint.cpp
|
||||
mouse/line/CLineOpSelectRange.cpp
|
||||
mouse/line/CScrOptEditLine.cpp
|
||||
- mouse/line/CScrOptRangeLine.cpp
|
||||
+ mouse/line/CScrOptRangeLine.cpp
|
||||
mouse/line/ILineOp.cpp
|
||||
mouse/line/IMouseEditLine.cpp
|
||||
plot/CPlot.cpp
|
||||
@@ -401,7 +401,7 @@ set( HDRS
|
||||
gis/CGisListDB.h
|
||||
gis/CGisListWks.h
|
||||
gis/CGisWorkspace.h
|
||||
- gis/CSelDevices.h
|
||||
+ gis/CSelDevices.h
|
||||
gis/IGisItem.h
|
||||
gis/IGisLine.h
|
||||
gis/Poi.h
|
||||
@@ -512,7 +512,7 @@ set( HDRS
|
||||
gis/trk/CInvalidTrk.h
|
||||
gis/trk/CKnownExtension.h
|
||||
gis/trk/CListTrkPts.h
|
||||
- gis/trk/CPropertyTrk.h
|
||||
+ gis/trk/CPropertyTrk.h
|
||||
gis/trk/CScrOptTrk.h
|
||||
gis/trk/CSelectActivityColor.h
|
||||
gis/trk/CTableTrk.h
|
||||
@@ -579,7 +579,7 @@ set( HDRS
|
||||
map/CMapList.h
|
||||
map/CMapMAP.h
|
||||
map/CMapPathSetup.h
|
||||
- map/CMapPropSetup.h
|
||||
+ map/CMapPropSetup.h
|
||||
map/CMapRMAP.h
|
||||
map/CMapTMS.h
|
||||
map/CMapVRT.h
|
||||
@@ -655,7 +655,7 @@ set( HDRS
|
||||
realtime/CRtSelectSource.h
|
||||
realtime/CRtWorkspace.h
|
||||
realtime/IRtInfo.h
|
||||
- realtime/IRtRecord.h
|
||||
+ realtime/IRtRecord.h
|
||||
realtime/IRtSource.h
|
||||
realtime/gpstether/CRtGpsTether.h
|
||||
realtime/gpstether/CRtGpsTetherInfo.h
|
||||
@@ -764,7 +764,7 @@ set( UIS
|
||||
gis/search/IGeoSearchWebConfigDialog.ui
|
||||
gis/search/ISearchExplanationDialog.ui
|
||||
gis/summary/IGisSummary.ui
|
||||
- gis/summary/IGisSummarySetup.ui
|
||||
+ gis/summary/IGisSummarySetup.ui
|
||||
gis/trk/ICombineTrk.ui
|
||||
gis/trk/ICutTrk.ui
|
||||
gis/trk/IDetailsTrk.ui
|
||||
@@ -818,7 +818,7 @@ set( UIS
|
||||
mouse/range/IActionSelect.ui
|
||||
mouse/range/IRangeToolSetup.ui
|
||||
mouse/range/IScrOptRangeTool.ui
|
||||
- mouse/range/IScrOptRangeTrk.ui
|
||||
+ mouse/range/IScrOptRangeTrk.ui
|
||||
mouse/IScrOptRuler.ui
|
||||
mouse/IScrOptSelect.ui
|
||||
mouse/line/IScrOptEditLine.ui
|
||||
@@ -899,7 +899,6 @@ include_directories(
|
||||
${PROJ_INCLUDE_DIRS}
|
||||
${ROUTINO_INCLUDE_DIRS}
|
||||
${ALGLIB_INCLUDE_DIRS}
|
||||
- ${QUAZIP_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
if(APPLE)
|
||||
@@ -934,10 +933,10 @@ endif(Qt5DBus_FOUND)
|
||||
|
||||
target_link_libraries(${APPLICATION_NAME}
|
||||
Qt5::Widgets
|
||||
- Qt5::Xml
|
||||
+ Qt5::Xml
|
||||
Qt5::Sql
|
||||
Qt5::PrintSupport
|
||||
- Qt5::UiTools
|
||||
+ Qt5::UiTools
|
||||
Qt5::Network
|
||||
Qt5::WebEngineWidgets
|
||||
Qt5::Qml
|
||||
@@ -947,7 +946,7 @@ target_link_libraries(${APPLICATION_NAME}
|
||||
${PROJ_LIBRARIES}
|
||||
${ROUTINO_LIBRARIES}
|
||||
${ALGLIB_LIBRARIES}
|
||||
- ${QUAZIP_LIBRARIES}
|
||||
+ QuaZip::QuaZip
|
||||
)
|
||||
|
||||
if(APPLE)
|
||||
|
|
@ -1,41 +1,84 @@
|
|||
{ lib, fetchFromGitHub, python2Packages, gnome2, keybinder }:
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, glib
|
||||
, gobject-introspection
|
||||
, gtk3
|
||||
, keybinder3
|
||||
, libwnck3
|
||||
, python3Packages
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
python2Packages.buildPythonApplication rec {
|
||||
ver = "0.93";
|
||||
name = "dockbarx-${ver}";
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "dockbarx";
|
||||
version = "${ver}-${rev}";
|
||||
ver = "1.0-beta";
|
||||
rev = "d98020ec49f3e3a5692ab2adbb145bbe5a1e80fe";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "M7S";
|
||||
owner = "xuzhen";
|
||||
repo = "dockbarx";
|
||||
rev = ver;
|
||||
sha256 = "1h1g2vag5vnx87sa1f0qi8rq7wlr2ymvkrdr08kk7cma4wk0x6hg";
|
||||
rev = rev;
|
||||
sha256 = "0xwqxh5mr2bi0sk54b848705awp0lfpd91am551811j2bdkbs04m";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py --replace /usr/ ""
|
||||
substituteInPlace setup.py --replace '"/", "usr", "share",' '"share",'
|
||||
substituteInPlace dockbarx/applets.py --replace /usr/share/ $out/share/
|
||||
substituteInPlace dockbarx/dockbar.py --replace /usr/share/ $out/share/
|
||||
substituteInPlace dockbarx/iconfactory.py --replace /usr/share/ $out/share/
|
||||
substituteInPlace dockbarx/theme.py --replace /usr/share/ $out/share/
|
||||
substituteInPlace dockx_applets/battery_status.py --replace /usr/share/ $out/share/
|
||||
substituteInPlace dockx_applets/namebar.py --replace /usr/share/ $out/share/
|
||||
substituteInPlace dockx_applets/namebar_window_buttons.py --replace /usr/share/ $out/share/
|
||||
substituteInPlace dockx_applets/volume-control.py --replace /usr/share/ $out/share/
|
||||
'';
|
||||
nativeBuildInputs = [
|
||||
glib.dev
|
||||
python3Packages.polib
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
propagatedBuildInputs = (with python2Packages; [ pygtk pyxdg dbus-python pillow xlib ])
|
||||
++ (with gnome2; [ gnome_python gnome_python_desktop ])
|
||||
++ [ keybinder ];
|
||||
buildInputs = [
|
||||
gobject-introspection
|
||||
gtk3
|
||||
libwnck3
|
||||
keybinder3
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
dbus-python
|
||||
pillow
|
||||
pygobject3
|
||||
pyxdg
|
||||
xlib
|
||||
];
|
||||
|
||||
# no tests
|
||||
doCheck = false;
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace /usr/ "" \
|
||||
--replace '"/", "usr", "share",' '"share",'
|
||||
|
||||
for f in \
|
||||
dbx_preference \
|
||||
dockbarx/applets.py \
|
||||
dockbarx/dockbar.py \
|
||||
dockbarx/iconfactory.py \
|
||||
dockbarx/theme.py \
|
||||
mate_panel_applet/dockbarx_mate_applet
|
||||
do
|
||||
substituteInPlace $f --replace /usr/share/ $out/share/
|
||||
done
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
glib-compile-schemas $out/share/glib-2.0/schemas
|
||||
'';
|
||||
|
||||
# Arguments to be passed to `makeWrapper`, only used by buildPython*
|
||||
preFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://launchpad.net/dockbar/";
|
||||
description = "Lightweight taskbar / panel replacement for Linux which works as a stand-alone dock";
|
||||
license = licenses.gpl3;
|
||||
homepage = "https://github.com/xuzhen/dockbarx";
|
||||
description = "Lightweight taskbar/panel replacement which works as a stand-alone dock";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.volth ];
|
||||
maintainers = [ maintainers.romildo ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
38
third_party/nixpkgs/pkgs/applications/misc/scli/default.nix
vendored
Normal file
38
third_party/nixpkgs/pkgs/applications/misc/scli/default.nix
vendored
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
{ lib, buildPythonApplication, fetchFromGitHub, signal-cli, urwid
|
||||
, urwid-readline, dbus }:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "scli";
|
||||
version = "0.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "isamert";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-hWzpqj/sxPq/doxdmytnj5rh2qKQE71WMB0ugomWhHg";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ signal-cli urwid urwid-readline dbus ];
|
||||
dontBuild = true;
|
||||
|
||||
checkPhase = ''
|
||||
# scli attempts to write to these directories, make sure they're writeable
|
||||
export XDG_DATA_HOME=$(mktemp -d)
|
||||
export XDG_CONFIG_HOME=$(mktemp -d)
|
||||
./scli --help > /dev/null # don't spam nix-build log
|
||||
test $? == 0
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
patchShebangs scli
|
||||
install -m755 -D scli $out/bin/scli
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Simple terminal user interface for Signal";
|
||||
homepage = "https://github.com/isamert/scli";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ alex-eyre ];
|
||||
};
|
||||
}
|
||||
|
|
@ -24,15 +24,15 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "tellico";
|
||||
version = "3.4";
|
||||
version = "3.4.1";
|
||||
|
||||
src = fetchurl {
|
||||
# version 3.3.0 just uses 3.3 in its name
|
||||
# version 3.3.0 just uses 3.3 in its file name
|
||||
urls = [
|
||||
"https://tellico-project.org/files/tellico-${version}.tar.xz"
|
||||
"https://tellico-project.org/files/tellico-${lib.versions.majorMinor version}.tar.xz"
|
||||
];
|
||||
sha256 = "sha256-YXMJrAkfehe3ox4WZ19igyFbXwtjO5wxN3bmgP01jPs=";
|
||||
sha256 = "sha256-+FFN6sO0mvlage8JazyrqNZk4onejz1XJPiOK3gnhWE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -63,7 +63,7 @@ mkDerivation rec {
|
|||
meta = with lib; {
|
||||
description = "Collection management software, free and simple";
|
||||
homepage = "https://tellico-project.org/";
|
||||
license = with licenses; [ gpl2 gpl3 ];
|
||||
license = with licenses; [ gpl2Only gpl3Only lgpl2Only ];
|
||||
maintainers = with maintainers; [ numkem ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
|
|
|||
32
third_party/nixpkgs/pkgs/applications/networking/cluster/dnsname-cni/default.nix
vendored
Normal file
32
third_party/nixpkgs/pkgs/applications/networking/cluster/dnsname-cni/default.nix
vendored
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{ buildGoModule, fetchFromGitHub, lib, dnsmasq }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "cni-plugin-dnsname";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = "dnsname";
|
||||
rev = "v${version}";
|
||||
sha256 = "090kpq2ppan9ayajdk5vwbvww30nphylgajn2p3441d4jg2nvsm3";
|
||||
};
|
||||
|
||||
patches = [ ./hardcode-dnsmasq-path.patch ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace plugins/meta/dnsname/service.go --replace '@DNSMASQ@' '${dnsmasq}/bin/dnsmasq'
|
||||
'';
|
||||
|
||||
vendorSha256 = null;
|
||||
subPackages = [ "plugins/meta/dnsname" ];
|
||||
|
||||
doCheck = false; # NOTE: requires root privileges
|
||||
|
||||
meta = with lib; {
|
||||
description = "DNS name resolution for containers";
|
||||
homepage = "https://github.com/containers/dnsname";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ mikroskeem ];
|
||||
};
|
||||
}
|
||||
19
third_party/nixpkgs/pkgs/applications/networking/cluster/dnsname-cni/hardcode-dnsmasq-path.patch
vendored
Normal file
19
third_party/nixpkgs/pkgs/applications/networking/cluster/dnsname-cni/hardcode-dnsmasq-path.patch
vendored
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
diff --git a/plugins/meta/dnsname/service.go b/plugins/meta/dnsname/service.go
|
||||
index fc05f75..f6b4caf 100644
|
||||
--- a/plugins/meta/dnsname/service.go
|
||||
+++ b/plugins/meta/dnsname/service.go
|
||||
@@ -16,10 +16,14 @@ import (
|
||||
|
||||
// newDNSMasqFile creates a new instance of a dnsNameFile
|
||||
func newDNSMasqFile(domainName, networkInterface, networkName string) (dnsNameFile, error) {
|
||||
+ /*
|
||||
dnsMasqBinary, err := exec.LookPath("dnsmasq")
|
||||
if err != nil {
|
||||
return dnsNameFile{}, errors.Errorf("the dnsmasq cni plugin requires the dnsmasq binary be in PATH")
|
||||
}
|
||||
+ */
|
||||
+ _ = errors.Errorf // XXX(mikroskeem): reduce diff
|
||||
+ dnsMasqBinary := "@DNSMASQ@"
|
||||
masqConf := dnsNameFile{
|
||||
ConfigFile: makePath(networkName, confFileName),
|
||||
Domain: domainName,
|
||||
|
|
@ -53,16 +53,6 @@ rec {
|
|||
|
||||
mkKops = generic;
|
||||
|
||||
kops_1_16 = mkKops {
|
||||
version = "1.16.4";
|
||||
sha256 = "0qi80hzd5wc8vn3y0wsckd7pq09xcshpzvcr7rl5zd4akxb0wl3f";
|
||||
};
|
||||
|
||||
kops_1_17 = mkKops {
|
||||
version = "1.17.2";
|
||||
sha256 = "0fmrzjz163hda6sl1jkl7cmg8fw6mmqb9953048jnhmd3w428xlz";
|
||||
};
|
||||
|
||||
kops_1_18 = mkKops {
|
||||
version = "1.18.2";
|
||||
sha256 = "17na83j6sfhk69w9ssvicc0xd1904z952ad3zzbpha50lcy6nlhp";
|
||||
|
|
@ -73,4 +63,10 @@ rec {
|
|||
sha256 = "15csxih1xy8myky37n5dyzp5mc31pc4bq9asaw6zz51mgw8ad5r9";
|
||||
rev = "v${version}";
|
||||
};
|
||||
|
||||
kops_1_20 = mkKops rec {
|
||||
version = "1.20.1";
|
||||
sha256 = "sha256-k6ODXbh7Bh+rBw6bjSNLxLY0fz7JLnrmJibnXz5qnSc=";
|
||||
rev = "v${version}";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -70,10 +70,10 @@
|
|||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/aws",
|
||||
"repo": "terraform-provider-aws",
|
||||
"rev": "v3.27.0",
|
||||
"sha256": "0hn55mpg64bibf10m7x7wpfkipvlm8q4avgqcf0rf8rmprwvdlxd",
|
||||
"vendorSha256": "0ph106bqsy988s20adf6gyc5jfvvy9zsj74lkbciwx7mvw5f514s",
|
||||
"version": "3.27.0"
|
||||
"rev": "v3.39.0",
|
||||
"sha256": "05clqnrgh8ydwnsb1bacg9is7pzwqz5ncr806xgvryxybp8lz2jg",
|
||||
"vendorSha256": "104cmwlzrcggb6fd1h7igy30g8542mzzzb6i54ldn5s1dahhprmb",
|
||||
"version": "3.39.0"
|
||||
},
|
||||
"azuread": {
|
||||
"owner": "hashicorp",
|
||||
|
|
@ -176,9 +176,10 @@
|
|||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/cloudinit",
|
||||
"repo": "terraform-provider-cloudinit",
|
||||
"rev": "v1.0.0",
|
||||
"sha256": "0i926f4xkfydd2bxmim69xrvi9ymn1vrc66zl117axzsmy9200zx",
|
||||
"version": "1.0.0"
|
||||
"rev": "v2.2.0",
|
||||
"sha256": "0yv52hz60whmqfwv2a6f9f1fpszcyzs78hhz3lq4imz9dv5bd29z",
|
||||
"vendorSha256": null,
|
||||
"version": "2.2.0"
|
||||
},
|
||||
"cloudscale": {
|
||||
"owner": "terraform-providers",
|
||||
|
|
@ -310,10 +311,10 @@
|
|||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/external",
|
||||
"repo": "terraform-provider-external",
|
||||
"rev": "v2.0.0",
|
||||
"sha256": "16wciz08gicicsirij2ql0gy8dg0372jjsqmaigkl2n07mqz2b6a",
|
||||
"rev": "v2.1.0",
|
||||
"sha256": "0xc3mj0d4yrr1952c5ywrx19ny1k2475grka9v2w7szdy6p2rkk5",
|
||||
"vendorSha256": null,
|
||||
"version": "2.0.0"
|
||||
"version": "2.1.0"
|
||||
},
|
||||
"fastly": {
|
||||
"owner": "terraform-providers",
|
||||
|
|
@ -401,10 +402,10 @@
|
|||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/helm",
|
||||
"repo": "terraform-provider-helm",
|
||||
"rev": "v2.0.2",
|
||||
"sha256": "119zvlkwa7ygwsjxxdl7z8cqb0c4m6gy21356jnsasf4c3557rrb",
|
||||
"rev": "v2.1.2",
|
||||
"sha256": "1385r9wk6mpb9fj53bkq586v8lw2310dim3kgj3pkrc1fssvwj0z",
|
||||
"vendorSha256": null,
|
||||
"version": "2.0.2"
|
||||
"version": "2.1.2"
|
||||
},
|
||||
"heroku": {
|
||||
"owner": "terraform-providers",
|
||||
|
|
@ -521,23 +522,32 @@
|
|||
"sha256": "1vcx612bz2p0rjsrx11j6fdc0f0q2jm5m3xl94wrpx9jjb7aczvc",
|
||||
"version": "1.0.0"
|
||||
},
|
||||
"kubectl": {
|
||||
"owner": "gavinbunney",
|
||||
"provider-source-address": "registry.terraform.io/gavinbunney/kubectl",
|
||||
"repo": "terraform-provider-kubectl",
|
||||
"rev": "v1.10.0",
|
||||
"sha256": "1w8g47dh77i7bhvxwysn7ldrcxl999sivxc7ws71ly5mnsljhhz0",
|
||||
"vendorSha256": "1qrw2mg8ik2n6xlrnbcrgs9zhr9mwh1niv47kzhbp3mxvj5vdskk",
|
||||
"version": "1.10.0"
|
||||
},
|
||||
"kubernetes": {
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/kubernetes",
|
||||
"repo": "terraform-provider-kubernetes",
|
||||
"rev": "v2.0.2",
|
||||
"sha256": "129aylw6hxa44syfnb0kkkihwvlaa6d1jnxrcbwkql6xxhn9zizf",
|
||||
"rev": "v2.1.0",
|
||||
"sha256": "02ygydgi3fa8z6qd04hgcilbbwns8f21agaqxly2pf9j23fzi37g",
|
||||
"vendorSha256": null,
|
||||
"version": "2.0.2"
|
||||
"version": "2.1.0"
|
||||
},
|
||||
"kubernetes-alpha": {
|
||||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/kubernetes-alpha",
|
||||
"repo": "terraform-provider-kubernetes-alpha",
|
||||
"rev": "v0.3.2",
|
||||
"sha256": "0lgh42fvfwvj6cw8i7800k016ay4babqiz38q0y7apq4s7vs62sb",
|
||||
"rev": "v0.3.3",
|
||||
"sha256": "18i9yp0w6mmic95p6d6ah1hl3rmgkh264z1a05973yslpqhyx9yl",
|
||||
"vendorSha256": null,
|
||||
"version": "0.3.2"
|
||||
"version": "0.3.3"
|
||||
},
|
||||
"launchdarkly": {
|
||||
"owner": "terraform-providers",
|
||||
|
|
@ -564,10 +574,10 @@
|
|||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/local",
|
||||
"repo": "terraform-provider-local",
|
||||
"rev": "v2.0.0",
|
||||
"sha256": "0c1mk63lh3qmj8pl80lyvvsgyg4gg7673abr8cfxrj45635h74z5",
|
||||
"rev": "v2.1.0",
|
||||
"sha256": "0lv1mvy4pkx0sc49xny4j0h30m64lvr3rnmqk85i5p0xhyn77gf2",
|
||||
"vendorSha256": null,
|
||||
"version": "2.0.0"
|
||||
"version": "2.1.0"
|
||||
},
|
||||
"logentries": {
|
||||
"owner": "terraform-providers",
|
||||
|
|
@ -671,10 +681,10 @@
|
|||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/null",
|
||||
"repo": "terraform-provider-null",
|
||||
"rev": "v3.0.0",
|
||||
"sha256": "0r1kvsc96922i85hdvf1pk8aicxjr6bc69gc63qi21hrl0jpvr7r",
|
||||
"rev": "v3.1.0",
|
||||
"sha256": "0s6j2py9bb3knrn0f8aga8ypkxj6v5ns08k7zgw26h3wwdxwyd12",
|
||||
"vendorSha256": null,
|
||||
"version": "3.0.0"
|
||||
"version": "3.1.0"
|
||||
},
|
||||
"nutanix": {
|
||||
"owner": "terraform-providers",
|
||||
|
|
@ -848,10 +858,10 @@
|
|||
"owner": "hashicorp",
|
||||
"provider-source-address": "registry.terraform.io/hashicorp/random",
|
||||
"repo": "terraform-provider-random",
|
||||
"rev": "v3.0.0",
|
||||
"sha256": "00dkpcri9ckp0kxwgh3p8175cyd44m8z13cb013pm4mrr61n4wq9",
|
||||
"rev": "v3.1.0",
|
||||
"sha256": "1677mia6bbydqa8w50f1y85rynpv9lhg9ar5s6japsr5g78lrcqf",
|
||||
"vendorSha256": null,
|
||||
"version": "3.0.0"
|
||||
"version": "3.1.0"
|
||||
},
|
||||
"rightscale": {
|
||||
"owner": "terraform-providers",
|
||||
|
|
|
|||
|
|
@ -45,8 +45,7 @@ in mkYarnPackage rec {
|
|||
|
||||
# executable wrapper
|
||||
makeWrapper '${electron}/bin/electron' "$out/bin/${executableName}" \
|
||||
--add-flags "$out/share/element/electron" \
|
||||
--set-default MOZ_DBUS_REMOTE 1
|
||||
--add-flags "$out/share/element/electron"
|
||||
'';
|
||||
|
||||
# Do not attempt generating a tarball for element-web again.
|
||||
|
|
|
|||
|
|
@ -721,25 +721,25 @@
|
|||
md5name = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca-libpng-1.6.37.tar.xz";
|
||||
}
|
||||
{
|
||||
name = "poppler-0.82.0.tar.xz";
|
||||
url = "https://dev-www.libreoffice.org/src/poppler-0.82.0.tar.xz";
|
||||
sha256 = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df";
|
||||
name = "poppler-21.01.0.tar.xz";
|
||||
url = "https://dev-www.libreoffice.org/src/poppler-21.01.0.tar.xz";
|
||||
sha256 = "016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3";
|
||||
md5 = "";
|
||||
md5name = "234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df-poppler-0.82.0.tar.xz";
|
||||
md5name = "016dde34e5f868ea98a32ca99b643325a9682281500942b7113f4ec88d20e2f3-poppler-21.01.0.tar.xz";
|
||||
}
|
||||
{
|
||||
name = "postgresql-9.2.24.tar.bz2";
|
||||
url = "https://dev-www.libreoffice.org/src/postgresql-9.2.24.tar.bz2";
|
||||
sha256 = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126";
|
||||
name = "postgresql-13.1.tar.bz2";
|
||||
url = "https://dev-www.libreoffice.org/src/postgresql-13.1.tar.bz2";
|
||||
sha256 = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f";
|
||||
md5 = "";
|
||||
md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2";
|
||||
md5name = "12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f-postgresql-13.1.tar.bz2";
|
||||
}
|
||||
{
|
||||
name = "Python-3.7.7.tar.xz";
|
||||
url = "https://dev-www.libreoffice.org/src/Python-3.7.7.tar.xz";
|
||||
sha256 = "06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136";
|
||||
name = "Python-3.7.10.tar.xz";
|
||||
url = "https://dev-www.libreoffice.org/src/Python-3.7.10.tar.xz";
|
||||
sha256 = "f8d82e7572c86ec9d55c8627aae5040124fd2203af400c383c821b980306ee6b";
|
||||
md5 = "";
|
||||
md5name = "06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136-Python-3.7.7.tar.xz";
|
||||
md5name = "f8d82e7572c86ec9d55c8627aae5040124fd2203af400c383c821b980306ee6b-Python-3.7.10.tar.xz";
|
||||
}
|
||||
{
|
||||
name = "QR-Code-generator-1.4.0.tar.gz";
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ rec {
|
|||
|
||||
major = "7";
|
||||
minor = "0";
|
||||
patch = "4";
|
||||
patch = "6";
|
||||
tweak = "2";
|
||||
|
||||
subdir = "${major}.${minor}.${patch}";
|
||||
|
|
@ -17,13 +17,13 @@ rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
|
||||
sha256 = "1g9akxvm7fh6lnprnc3g184qdy8gbinhb4rb60gjpw82ip6d5acz";
|
||||
sha256 = "0bk1dc6g8z5akrprfxxy3dm0vdmihaaxnsprxpqbqmqrqzkzg8cn";
|
||||
};
|
||||
|
||||
# FIXME rename
|
||||
translations = fetchSrc {
|
||||
name = "translations";
|
||||
sha256 = "1v3kpk56fm783d5wihx41jqidpclizkfxrg4n0pq95d79hdiljsl";
|
||||
sha256 = "04f76r311hppil656ajab52x0xwqszazlgssyi5w97wak2zkmqgj";
|
||||
};
|
||||
|
||||
# the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from
|
||||
|
|
@ -31,6 +31,6 @@ rec {
|
|||
|
||||
help = fetchSrc {
|
||||
name = "help";
|
||||
sha256 = "1np9f799ww12kggl5az6piv5fi9rf737il5a5r47r4wl2li56qqb";
|
||||
sha256 = "1xmvlj9nrmg8448k4zfaxn5qqxa4amnvvhs1l1smi2bz3xh4xn2d";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@
|
|||
# Softmaker Office or when the upstream archive was replaced and
|
||||
# nixpkgs is not in sync yet.
|
||||
, officeVersion ? {
|
||||
version = "1030";
|
||||
version = "1032";
|
||||
edition = "2021";
|
||||
hash = "sha256-bpnyPyZnJc9RFVrFM2o3M7Gc4PSKFGpaM1Yo8ZKGHrE=";
|
||||
hash = "sha256-LchSqLVBdkmWJQ8hCEvtwRPgIUSDE0URKPzCkEexGbc=";
|
||||
}
|
||||
|
||||
, ... } @ args:
|
||||
|
|
|
|||
|
|
@ -9,16 +9,16 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "delta";
|
||||
version = "0.7.1";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dandavison";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "02gm3fxqq91gn1hffy9kc6dkc0y7p09sl6f8njfpsaficij4bs7a";
|
||||
sha256 = "01s73ld3npdmrjbay1lmd13bn9lg2pbmj14gklxi3j9aj0y2q8w8";
|
||||
};
|
||||
|
||||
cargoSha256 = "1w1w98vhjd561mkiwv89zb8k0nf1p5fc67jb5dddwg9nj6mqjrhp";
|
||||
cargoSha256 = "1pi4sm07nm1irigrfgysfw99vw96zzz07a1qw5m7bmj6aqp0r3fr";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
# be nice to add the native GUI (and/or the GTK GUI) as an option too, but that
|
||||
# requires invoking the Xcode build system, which is non-trivial for now.
|
||||
|
||||
{ stdenv, lib, fetchFromGitHub,
|
||||
{ stdenv, lib, fetchFromGitHub, fetchpatch,
|
||||
# Main build tools
|
||||
pkg-config, autoconf, automake, libtool, m4, xz, python3,
|
||||
numactl,
|
||||
|
|
@ -58,6 +58,15 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
};
|
||||
|
||||
# Remove with a release after 1.3.3
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "audio-fix-ffmpeg-4_4";
|
||||
url = "https://github.com/HandBrake/HandBrake/commit/f28289fb06ab461ea082b4be56d6d1504c0c31c2.patch";
|
||||
sha256 = "sha256:1zcwa4h97d8wjspb8kbd8b1jg0a9vvmv9zaphzry4m9q0bj3h3kz";
|
||||
})
|
||||
];
|
||||
|
||||
# we put as little as possible in src.extraPostFetch as it's much easier to
|
||||
# add to it here without having to fiddle with src.sha256
|
||||
# only DATE and HASH are absolutely necessary
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ rec {
|
|||
, containerdRev, containerdSha256
|
||||
, tiniRev, tiniSha256, buildxSupport ? false
|
||||
# package dependencies
|
||||
, stdenv, fetchFromGitHub, fetchpatch, buildGoPackage
|
||||
, stdenv, fetchFromGitHub, buildGoPackage
|
||||
, makeWrapper, installShellFiles, pkg-config
|
||||
, go-md2man, go, containerd, runc, docker-proxy, tini, libtool
|
||||
, sqlite, iproute2, lvm2, systemd, docker-buildx
|
||||
|
|
@ -124,7 +124,7 @@ rec {
|
|||
}) // rec {
|
||||
inherit version rev;
|
||||
|
||||
name = "docker-${version}";
|
||||
pname = "docker";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "docker";
|
||||
|
|
@ -163,8 +163,6 @@ rec {
|
|||
postPatch = ''
|
||||
patchShebangs .
|
||||
substituteInPlace ./scripts/build/.variables --replace "set -eu" ""
|
||||
substituteInPlace ./scripts/docs/generate-man.sh --replace "-v md2man" "-v go-md2man"
|
||||
substituteInPlace ./man/md2man-all.sh --replace md2man go-md2man
|
||||
'' + optionalString buildxSupport ''
|
||||
substituteInPlace ./cli-plugins/manager/manager_unix.go --replace /usr/libexec/docker/cli-plugins \
|
||||
${lib.strings.makeSearchPathOutput "bin" "libexec/docker/cli-plugins" [docker-buildx]}
|
||||
|
|
@ -222,19 +220,19 @@ rec {
|
|||
# Get revisions from
|
||||
# https://github.com/moby/moby/tree/${version}/hack/dockerfile/install/*
|
||||
docker_20_10 = callPackage dockerGen rec {
|
||||
version = "20.10.2";
|
||||
version = "20.10.6";
|
||||
rev = "v${version}";
|
||||
sha256 = "0z0hpm5hrqh7p8my8lmiwpym2shs48my6p0zv2cc34wym0hcly51";
|
||||
sha256 = "15kknb26vyzjgqmn8r81a1sy1i5br6bvngqd5xljihppnxvp2gvl";
|
||||
moby-src = fetchFromGitHub {
|
||||
owner = "moby";
|
||||
repo = "moby";
|
||||
rev = "v${version}";
|
||||
sha256 = "0c2zycpnwj4kh8m8xckv1raj3fx07q9bfaj46rr85jihm4p2dp5w";
|
||||
sha256 = "1l4ra9bsvydaxd2fy7dgxp7ynpp0mrlwvcdhxiafw596559ab6qk";
|
||||
};
|
||||
runcRev = "ff819c7e9184c13b7c2607fe6c30ae19403a7aff"; # v1.0.0-rc92
|
||||
runcSha256 = "0r4zbxbs03xr639r7848282j1ybhibfdhnxyap9p76j5w8ixms94";
|
||||
containerdRev = "269548fa27e0089a8b8278fc4fc781d7f65a939b"; # v1.4.3
|
||||
containerdSha256 = "09xvhjg5f8h90w1y94kqqnqzhbhd62dcdd9wb9sdqakisjk6zrl0";
|
||||
runcRev = "b9ee9c6314599f1b4a7f497e1f1f856fe433d3b7"; # v1.0.0-rc95
|
||||
runcSha256 = "18sbvmlvb6kird4w3rqsfrjdj7n25firabvdxsl0rxjfy9r1g2xb";
|
||||
containerdRev = "12dca9790f4cb6b18a6a7a027ce420145cb98ee7"; # v1.5.1
|
||||
containerdSha256 = "16q34yiv5q98b9d5vgy1lmmppg8agrmnfd1kzpakkf4czkws0p4d";
|
||||
tiniRev = "de40ad007797e0dcd8b7126f27bb87401d224240"; # v0.19.0
|
||||
tiniSha256 = "1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn";
|
||||
};
|
||||
|
|
|
|||
32
third_party/nixpkgs/pkgs/applications/virtualization/imgcrypt/default.nix
vendored
Normal file
32
third_party/nixpkgs/pkgs/applications/virtualization/imgcrypt/default.nix
vendored
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{ buildGoModule, fetchFromGitHub, lib }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "imgcrypt";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containerd";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "177fs3p2xzwjsffcxqqllx6wi6ghfyqbvfgn95v3q7a2993yqk4k";
|
||||
};
|
||||
|
||||
buildFlagsArray = [
|
||||
"-ldflags=-X github.com/containerd/containerd/version.Version=${version}"
|
||||
];
|
||||
|
||||
vendorSha256 = null;
|
||||
subPackages = [ "cmd/ctd-decoder" "cmd/ctr" ];
|
||||
|
||||
postFixup = ''
|
||||
mv $out/bin/ctr $out/bin/ctr-enc
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Image encryption library and command line tool";
|
||||
homepage = "https://github.com/containerd/imgcrypt";
|
||||
license = licenses.asl20;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ mikroskeem ];
|
||||
};
|
||||
}
|
||||
|
|
@ -32,10 +32,9 @@ python3Packages.buildPythonApplication rec {
|
|||
gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943
|
||||
] ++ optional spiceSupport spice-gtk;
|
||||
|
||||
propagatedBuildInputs = with python3Packages;
|
||||
[
|
||||
pygobject3 ipaddress libvirt libxml2 requests
|
||||
];
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
pygobject3 ipaddress libvirt libxml2 requests cdrtools
|
||||
];
|
||||
|
||||
patchPhase = ''
|
||||
sed -i 's|/usr/share/libvirt/cpu_map.xml|${system-libvirt}/share/libvirt/cpu_map.xml|g' virtinst/capabilities.py
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
|
|||
tags.
|
||||
'';
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ viric ];
|
||||
maintainers = with maintainers; [ viric neonfuz ];
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
7
third_party/nixpkgs/pkgs/build-support/fetchgitea/default.nix
vendored
Normal file
7
third_party/nixpkgs/pkgs/build-support/fetchgitea/default.nix
vendored
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
# Gitea's URLs are compatible with GitHub
|
||||
|
||||
{ lib, fetchFromGitHub }:
|
||||
|
||||
{ domain, ... }@args:
|
||||
|
||||
fetchFromGitHub ((removeAttrs args [ "domain" ]) // { githubBase = domain; })
|
||||
|
|
@ -7,6 +7,7 @@
|
|||
, cargoInstallHook
|
||||
, cargoSetupHook
|
||||
, fetchCargoTarball
|
||||
, importCargoLock
|
||||
, runCommandNoCC
|
||||
, rustPlatform
|
||||
, callPackage
|
||||
|
|
@ -42,6 +43,7 @@
|
|||
, cargoDepsHook ? ""
|
||||
, buildType ? "release"
|
||||
, meta ? {}
|
||||
, cargoLock ? null
|
||||
, cargoVendorDir ? null
|
||||
, checkType ? buildType
|
||||
, depsExtraArgs ? {}
|
||||
|
|
@ -56,19 +58,22 @@
|
|||
, buildAndTestSubdir ? null
|
||||
, ... } @ args:
|
||||
|
||||
assert cargoVendorDir == null -> !(cargoSha256 == "" && cargoHash == "");
|
||||
assert cargoVendorDir == null && cargoLock == null -> cargoSha256 == "" && cargoHash == ""
|
||||
-> throw "cargoSha256, cargoHash, cargoVendorDir, or cargoLock must be set";
|
||||
assert buildType == "release" || buildType == "debug";
|
||||
|
||||
let
|
||||
|
||||
cargoDeps = if cargoVendorDir == null
|
||||
then fetchCargoTarball ({
|
||||
inherit src srcs sourceRoot unpackPhase cargoUpdateHook;
|
||||
name = cargoDepsName;
|
||||
hash = cargoHash;
|
||||
patches = cargoPatches;
|
||||
sha256 = cargoSha256;
|
||||
} // depsExtraArgs)
|
||||
cargoDeps =
|
||||
if cargoVendorDir == null
|
||||
then if cargoLock != null then importCargoLock cargoLock
|
||||
else fetchCargoTarball ({
|
||||
inherit src srcs sourceRoot unpackPhase cargoUpdateHook;
|
||||
name = cargoDepsName;
|
||||
hash = cargoHash;
|
||||
patches = cargoPatches;
|
||||
sha256 = cargoSha256;
|
||||
} // depsExtraArgs)
|
||||
else null;
|
||||
|
||||
# If we have a cargoSha256 fixed-output derivation, validate it at build time
|
||||
|
|
@ -97,7 +102,7 @@ in
|
|||
# See https://os.phil-opp.com/testing/ for more information.
|
||||
assert useSysroot -> !(args.doCheck or true);
|
||||
|
||||
stdenv.mkDerivation ((removeAttrs args ["depsExtraArgs"]) // lib.optionalAttrs useSysroot {
|
||||
stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoLock" ]) // lib.optionalAttrs useSysroot {
|
||||
RUSTFLAGS = "--sysroot ${sysroot} " + (args.RUSTFLAGS or "");
|
||||
} // {
|
||||
inherit buildAndTestSubdir cargoDeps;
|
||||
|
|
|
|||
167
third_party/nixpkgs/pkgs/build-support/rust/import-cargo-lock.nix
vendored
Normal file
167
third_party/nixpkgs/pkgs/build-support/rust/import-cargo-lock.nix
vendored
Normal file
|
|
@ -0,0 +1,167 @@
|
|||
{ fetchgit, fetchurl, lib, runCommand, cargo, jq }:
|
||||
|
||||
{
|
||||
# Cargo lock file
|
||||
lockFile
|
||||
|
||||
# Hashes for git dependencies.
|
||||
, outputHashes ? {}
|
||||
}:
|
||||
|
||||
let
|
||||
# Parse a git source into different components.
|
||||
parseGit = src:
|
||||
let
|
||||
parts = builtins.match ''git\+([^?]+)(\?rev=(.*))?#(.*)?'' src;
|
||||
rev = builtins.elemAt parts 2;
|
||||
in
|
||||
if parts == null then null
|
||||
else {
|
||||
url = builtins.elemAt parts 0;
|
||||
sha = builtins.elemAt parts 3;
|
||||
} // lib.optionalAttrs (rev != null) { inherit rev; };
|
||||
|
||||
packages = (builtins.fromTOML (builtins.readFile lockFile)).package;
|
||||
|
||||
# There is no source attribute for the source package itself. But
|
||||
# since we do not want to vendor the source package anyway, we can
|
||||
# safely skip it.
|
||||
depPackages = (builtins.filter (p: p ? "source") packages);
|
||||
|
||||
# Create dependent crates from packages.
|
||||
#
|
||||
# Force evaluation of the git SHA -> hash mapping, so that an error is
|
||||
# thrown if there are stale hashes. We cannot rely on gitShaOutputHash
|
||||
# being evaluated otherwise, since there could be no git dependencies.
|
||||
depCrates = builtins.deepSeq (gitShaOutputHash) (builtins.map mkCrate depPackages);
|
||||
|
||||
# Map package name + version to git commit SHA for packages with a git source.
|
||||
namesGitShas = builtins.listToAttrs (
|
||||
builtins.map nameGitSha (builtins.filter (pkg: lib.hasPrefix "git+" pkg.source) depPackages)
|
||||
);
|
||||
|
||||
nameGitSha = pkg: let gitParts = parseGit pkg.source; in {
|
||||
name = "${pkg.name}-${pkg.version}";
|
||||
value = gitParts.sha;
|
||||
};
|
||||
|
||||
# Convert the attrset provided through the `outputHashes` argument to a
|
||||
# a mapping from git commit SHA -> output hash.
|
||||
#
|
||||
# There may be multiple different packages with different names
|
||||
# originating from the same git repository (typically a Cargo
|
||||
# workspace). By using the git commit SHA as a universal identifier,
|
||||
# the user does not have to specify the output hash for every package
|
||||
# individually.
|
||||
gitShaOutputHash = lib.mapAttrs' (nameVer: hash:
|
||||
let
|
||||
unusedHash = throw "A hash was specified for ${nameVer}, but there is no corresponding git dependency.";
|
||||
rev = namesGitShas.${nameVer} or unusedHash; in {
|
||||
name = rev;
|
||||
value = hash;
|
||||
}) outputHashes;
|
||||
|
||||
# We can't use the existing fetchCrate function, since it uses a
|
||||
# recursive hash of the unpacked crate.
|
||||
fetchCrate = pkg: fetchurl {
|
||||
name = "crate-${pkg.name}-${pkg.version}.tar.gz";
|
||||
url = "https://crates.io/api/v1/crates/${pkg.name}/${pkg.version}/download";
|
||||
sha256 = pkg.checksum;
|
||||
};
|
||||
|
||||
# Fetch and unpack a crate.
|
||||
mkCrate = pkg:
|
||||
let
|
||||
gitParts = parseGit pkg.source;
|
||||
in
|
||||
if pkg.source == "registry+https://github.com/rust-lang/crates.io-index" then
|
||||
let
|
||||
crateTarball = fetchCrate pkg;
|
||||
in runCommand "${pkg.name}-${pkg.version}" {} ''
|
||||
mkdir $out
|
||||
tar xf "${crateTarball}" -C $out --strip-components=1
|
||||
|
||||
# Cargo is happy with largely empty metadata.
|
||||
printf '{"files":{},"package":"${pkg.checksum}"}' > "$out/.cargo-checksum.json"
|
||||
''
|
||||
else if gitParts != null then
|
||||
let
|
||||
missingHash = throw ''
|
||||
No hash was found while vendoring the git dependency ${pkg.name}-${pkg.version}. You can add
|
||||
a hash through the `outputHashes` argument of `importCargoLock`:
|
||||
|
||||
outputHashes = {
|
||||
"${pkg.name}-${pkg.version}" = "<hash>";
|
||||
};
|
||||
|
||||
If you use `buildRustPackage`, you can add this attribute to the `cargoLock`
|
||||
attribute set.
|
||||
'';
|
||||
sha256 = gitShaOutputHash.${gitParts.sha} or missingHash;
|
||||
tree = fetchgit {
|
||||
inherit sha256;
|
||||
inherit (gitParts) url;
|
||||
rev = gitParts.sha; # The commit SHA is always available.
|
||||
};
|
||||
in runCommand "${pkg.name}-${pkg.version}" {} ''
|
||||
tree=${tree}
|
||||
if grep --quiet '\[workspace\]' "$tree/Cargo.toml"; then
|
||||
# If the target package is in a workspace, find the crate path
|
||||
# using `cargo metadata`.
|
||||
crateCargoTOML=$(${cargo}/bin/cargo metadata --format-version 1 --no-deps --manifest-path $tree/Cargo.toml | \
|
||||
${jq}/bin/jq -r '.packages[] | select(.name == "${pkg.name}") | .manifest_path')
|
||||
|
||||
if [[ ! -z $crateCargoTOML ]]; then
|
||||
tree=$(dirname $crateCargoTOML)
|
||||
else
|
||||
>&2 echo "Cannot find path for crate '${pkg.name}-${pkg.version}' in the Cargo workspace in: $tree"
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
cp -prvd "$tree/" $out
|
||||
chmod u+w $out
|
||||
|
||||
# Cargo is happy with empty metadata.
|
||||
printf '{"files":{},"package":null}' > "$out/.cargo-checksum.json"
|
||||
|
||||
# Set up configuration for the vendor directory.
|
||||
cat > $out/.cargo-config <<EOF
|
||||
[source."${gitParts.url}"]
|
||||
git = "${gitParts.url}"
|
||||
${lib.optionalString (gitParts ? rev) "rev = \"${gitParts.rev}\""}
|
||||
replace-with = "vendored-sources"
|
||||
EOF
|
||||
''
|
||||
else throw "Cannot handle crate source: ${pkg.source}";
|
||||
|
||||
vendorDir = runCommand "cargo-vendor-dir" {} ''
|
||||
mkdir -p $out/.cargo
|
||||
|
||||
ln -s ${lockFile} $out/Cargo.lock
|
||||
|
||||
cat > $out/.cargo/config <<EOF
|
||||
[source.crates-io]
|
||||
replace-with = "vendored-sources"
|
||||
|
||||
[source.vendored-sources]
|
||||
directory = "cargo-vendor-dir"
|
||||
EOF
|
||||
|
||||
declare -A keysSeen
|
||||
|
||||
for crate in ${toString depCrates}; do
|
||||
# Link the crate directory, removing the output path hash from the destination.
|
||||
ln -s "$crate" $out/$(basename "$crate" | cut -c 34-)
|
||||
|
||||
if [ -e "$crate/.cargo-config" ]; then
|
||||
key=$(sed 's/\[source\."\(.*\)"\]/\1/; t; d' < "$crate/.cargo-config")
|
||||
if [[ -z ''${keysSeen[$key]} ]]; then
|
||||
keysSeen[$key]=1
|
||||
cat "$crate/.cargo-config" >> $out/.cargo/config
|
||||
fi
|
||||
fi
|
||||
done
|
||||
'';
|
||||
in
|
||||
vendorDir
|
||||
83
third_party/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/basic/Cargo.lock
generated
vendored
Normal file
83
third_party/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/basic/Cargo.lock
generated
vendored
Normal file
|
|
@ -0,0 +1,83 @@
|
|||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
[[package]]
|
||||
name = "basic"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"rand",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "cfg-if"
|
||||
version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
|
||||
[[package]]
|
||||
name = "getrandom"
|
||||
version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"wasi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.94"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e"
|
||||
|
||||
[[package]]
|
||||
name = "ppv-lite86"
|
||||
version = "0.2.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
|
||||
|
||||
[[package]]
|
||||
name = "rand"
|
||||
version = "0.8.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"rand_chacha",
|
||||
"rand_core",
|
||||
"rand_hc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_chacha"
|
||||
version = "0.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d"
|
||||
dependencies = [
|
||||
"ppv-lite86",
|
||||
"rand_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_core"
|
||||
version = "0.6.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7"
|
||||
dependencies = [
|
||||
"getrandom",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_hc"
|
||||
version = "0.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73"
|
||||
dependencies = [
|
||||
"rand_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasi"
|
||||
version = "0.10.2+wasi-snapshot-preview1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
|
||||
8
third_party/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/basic/Cargo.toml
vendored
Normal file
8
third_party/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/basic/Cargo.toml
vendored
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
[package]
|
||||
name = "basic"
|
||||
version = "0.1.0"
|
||||
authors = ["Daniël de Kok <me@danieldk.eu>"]
|
||||
edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
rand = "0.8"
|
||||
18
third_party/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/basic/default.nix
vendored
Normal file
18
third_party/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/basic/default.nix
vendored
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
{ rustPlatform }:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "basic";
|
||||
version = "0.1.0";
|
||||
|
||||
src = ./.;
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
};
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
installCheckPhase = ''
|
||||
$out/bin/basic
|
||||
'';
|
||||
}
|
||||
9
third_party/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/basic/src/main.rs
vendored
Normal file
9
third_party/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/basic/src/main.rs
vendored
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
use rand::Rng;
|
||||
|
||||
fn main() {
|
||||
let mut rng = rand::thread_rng();
|
||||
|
||||
// Always draw zero :).
|
||||
let roll: u8 = rng.gen_range(0..1);
|
||||
assert_eq!(roll, 0);
|
||||
}
|
||||
8
third_party/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/default.nix
vendored
Normal file
8
third_party/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/default.nix
vendored
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
{ callPackage }:
|
||||
|
||||
{
|
||||
basic = callPackage ./basic { };
|
||||
gitDependency = callPackage ./git-dependency { };
|
||||
gitDependencyNoRev = callPackage ./git-dependency-no-rev { };
|
||||
maturin = callPackage ./maturin { };
|
||||
}
|
||||
79
third_party/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/Cargo.lock
generated
vendored
Normal file
79
third_party/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency-no-rev/Cargo.lock
generated
vendored
Normal file
|
|
@ -0,0 +1,79 @@
|
|||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
[[package]]
|
||||
name = "cfg-if"
|
||||
version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
|
||||
[[package]]
|
||||
name = "getrandom"
|
||||
version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"wasi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "git-dependency-no-rev"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"rand",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.94"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e"
|
||||
|
||||
[[package]]
|
||||
name = "ppv-lite86"
|
||||
version = "0.2.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
|
||||
|
||||
[[package]]
|
||||
name = "rand"
|
||||
version = "0.8.3"
|
||||
source = "git+https://github.com/rust-random/rand.git#f0e01ee0a7257753cc51b291f62666f4765923ef"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"rand_chacha",
|
||||
"rand_core",
|
||||
"rand_hc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_chacha"
|
||||
version = "0.3.0"
|
||||
source = "git+https://github.com/rust-random/rand.git#f0e01ee0a7257753cc51b291f62666f4765923ef"
|
||||
dependencies = [
|
||||
"ppv-lite86",
|
||||
"rand_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_core"
|
||||
version = "0.6.2"
|
||||
source = "git+https://github.com/rust-random/rand.git#f0e01ee0a7257753cc51b291f62666f4765923ef"
|
||||
dependencies = [
|
||||
"getrandom",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_hc"
|
||||
version = "0.3.0"
|
||||
source = "git+https://github.com/rust-random/rand.git#f0e01ee0a7257753cc51b291f62666f4765923ef"
|
||||
dependencies = [
|
||||
"rand_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasi"
|
||||
version = "0.10.2+wasi-snapshot-preview1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
[package]
|
||||
name = "git-dependency-no-rev"
|
||||
version = "0.1.0"
|
||||
authors = ["Daniël de Kok <me@danieldk.eu>"]
|
||||
edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
rand = { git = "https://github.com/rust-random/rand.git" }
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
{ rustPlatform }:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "git-dependency-no-rev";
|
||||
version = "0.1.0";
|
||||
|
||||
src = ./.;
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"rand-0.8.3" = "0ya2hia3cn31qa8894s3av2s8j5bjwb6yq92k0jsnlx7jid0jwqa";
|
||||
};
|
||||
};
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
installCheckPhase = ''
|
||||
$out/bin/git-dependency-no-rev
|
||||
'';
|
||||
}
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
use rand::Rng;
|
||||
|
||||
fn main() {
|
||||
let mut rng = rand::thread_rng();
|
||||
|
||||
// Always draw zero :).
|
||||
let roll: u8 = rng.gen_range(0..1);
|
||||
assert_eq!(roll, 0);
|
||||
}
|
||||
79
third_party/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.lock
generated
vendored
Normal file
79
third_party/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.lock
generated
vendored
Normal file
|
|
@ -0,0 +1,79 @@
|
|||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
[[package]]
|
||||
name = "cfg-if"
|
||||
version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
|
||||
[[package]]
|
||||
name = "getrandom"
|
||||
version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"wasi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "git-dependency"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"rand",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.94"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e"
|
||||
|
||||
[[package]]
|
||||
name = "ppv-lite86"
|
||||
version = "0.2.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
|
||||
|
||||
[[package]]
|
||||
name = "rand"
|
||||
version = "0.8.3"
|
||||
source = "git+https://github.com/rust-random/rand.git?rev=0.8.3#6ecbe2626b2cc6110a25c97b1702b347574febc7"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"rand_chacha",
|
||||
"rand_core",
|
||||
"rand_hc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_chacha"
|
||||
version = "0.3.0"
|
||||
source = "git+https://github.com/rust-random/rand.git?rev=0.8.3#6ecbe2626b2cc6110a25c97b1702b347574febc7"
|
||||
dependencies = [
|
||||
"ppv-lite86",
|
||||
"rand_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_core"
|
||||
version = "0.6.1"
|
||||
source = "git+https://github.com/rust-random/rand.git?rev=0.8.3#6ecbe2626b2cc6110a25c97b1702b347574febc7"
|
||||
dependencies = [
|
||||
"getrandom",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_hc"
|
||||
version = "0.3.0"
|
||||
source = "git+https://github.com/rust-random/rand.git?rev=0.8.3#6ecbe2626b2cc6110a25c97b1702b347574febc7"
|
||||
dependencies = [
|
||||
"rand_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasi"
|
||||
version = "0.10.2+wasi-snapshot-preview1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
|
||||
8
third_party/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.toml
vendored
Normal file
8
third_party/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/Cargo.toml
vendored
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
[package]
|
||||
name = "git-dependency"
|
||||
version = "0.1.0"
|
||||
authors = ["Daniël de Kok <me@danieldk.eu>"]
|
||||
edition = "2018"
|
||||
|
||||
[dependencies]
|
||||
rand = { git = "https://github.com/rust-random/rand.git", rev = "0.8.3" }
|
||||
21
third_party/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/default.nix
vendored
Normal file
21
third_party/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/git-dependency/default.nix
vendored
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
{ rustPlatform }:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = "git-dependency";
|
||||
version = "0.1.0";
|
||||
|
||||
src = ./.;
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"rand-0.8.3" = "0l3p174bpwia61vcvxz5mw65a13ri3wy94z04xrnyy5lzciykz4f";
|
||||
};
|
||||
};
|
||||
|
||||
doInstallCheck = true;
|
||||
|
||||
installCheckPhase = ''
|
||||
$out/bin/git-dependency
|
||||
'';
|
||||
}
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
use rand::Rng;
|
||||
|
||||
fn main() {
|
||||
let mut rng = rand::thread_rng();
|
||||
|
||||
// Always draw zero :).
|
||||
let roll: u8 = rng.gen_range(0..1);
|
||||
assert_eq!(roll, 0);
|
||||
}
|
||||
682
third_party/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/maturin/Cargo.lock
generated
vendored
Normal file
682
third_party/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/maturin/Cargo.lock
generated
vendored
Normal file
|
|
@ -0,0 +1,682 @@
|
|||
# This file is automatically @generated by Cargo.
|
||||
# It is not intended for manual editing.
|
||||
[[package]]
|
||||
name = "ahash"
|
||||
version = "0.4.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e"
|
||||
|
||||
[[package]]
|
||||
name = "assert_approx_eq"
|
||||
version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3c07dab4369547dbe5114677b33fbbf724971019f3818172d59a97a61c774ffd"
|
||||
|
||||
[[package]]
|
||||
name = "autocfg"
|
||||
version = "1.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
|
||||
|
||||
[[package]]
|
||||
name = "bitflags"
|
||||
version = "1.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
|
||||
|
||||
[[package]]
|
||||
name = "byteorder"
|
||||
version = "1.4.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b"
|
||||
|
||||
[[package]]
|
||||
name = "cfg-if"
|
||||
version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
|
||||
[[package]]
|
||||
name = "const_fn"
|
||||
version = "0.4.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "28b9d6de7f49e22cf97ad17fc4036ece69300032f45f78f30b4a4482cdc3f4a6"
|
||||
|
||||
[[package]]
|
||||
name = "crossbeam-channel"
|
||||
version = "0.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"crossbeam-utils",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "crossbeam-deque"
|
||||
version = "0.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"crossbeam-epoch",
|
||||
"crossbeam-utils",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "crossbeam-epoch"
|
||||
version = "0.9.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"const_fn",
|
||||
"crossbeam-utils",
|
||||
"lazy_static",
|
||||
"memoffset",
|
||||
"scopeguard",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "crossbeam-utils"
|
||||
version = "0.8.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"cfg-if",
|
||||
"lazy_static",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ctor"
|
||||
version = "0.1.19"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e8f45d9ad417bcef4817d614a501ab55cdd96a6fdb24f49aab89a54acfd66b19"
|
||||
dependencies = [
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "either"
|
||||
version = "1.6.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
|
||||
|
||||
[[package]]
|
||||
name = "getrandom"
|
||||
version = "0.1.16"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"wasi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ghost"
|
||||
version = "0.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1a5bcf1bbeab73aa4cf2fde60a846858dc036163c7c33bec309f8d17de785479"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "glob"
|
||||
version = "0.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574"
|
||||
|
||||
[[package]]
|
||||
name = "hashbrown"
|
||||
version = "0.9.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
|
||||
dependencies = [
|
||||
"ahash",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "hermit-abi"
|
||||
version = "0.1.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "indoc"
|
||||
version = "0.3.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "47741a8bc60fb26eb8d6e0238bbb26d8575ff623fdc97b1a2c00c050b9684ed8"
|
||||
dependencies = [
|
||||
"indoc-impl",
|
||||
"proc-macro-hack",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "indoc-impl"
|
||||
version = "0.3.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ce046d161f000fffde5f432a0d034d0341dc152643b2598ed5bfce44c4f3a8f0"
|
||||
dependencies = [
|
||||
"proc-macro-hack",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
"unindent",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "instant"
|
||||
version = "0.1.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "inventory"
|
||||
version = "0.1.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0f0f7efb804ec95e33db9ad49e4252f049e37e8b0a4652e3cd61f7999f2eff7f"
|
||||
dependencies = [
|
||||
"ctor",
|
||||
"ghost",
|
||||
"inventory-impl",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "inventory-impl"
|
||||
version = "0.1.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "75c094e94816723ab936484666968f5b58060492e880f3c8d00489a1e244fa51"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "itoa"
|
||||
version = "0.4.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
|
||||
|
||||
[[package]]
|
||||
name = "lazy_static"
|
||||
version = "1.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
||||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.86"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c"
|
||||
|
||||
[[package]]
|
||||
name = "lock_api"
|
||||
version = "0.4.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312"
|
||||
dependencies = [
|
||||
"scopeguard",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "memoffset"
|
||||
version = "0.6.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-bigint"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5e9a41747ae4633fce5adffb4d2e81ffc5e89593cb19917f8fb2cc5ff76507bf"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"num-integer",
|
||||
"num-traits",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-complex"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "747d632c0c558b87dbabbe6a82f3b4ae03720d0646ac5b7b4dae89394be5f2c5"
|
||||
dependencies = [
|
||||
"num-traits",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-integer"
|
||||
version = "0.1.44"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"num-traits",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-traits"
|
||||
version = "0.2.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num_cpus"
|
||||
version = "1.13.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3"
|
||||
dependencies = [
|
||||
"hermit-abi",
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "parking_lot"
|
||||
version = "0.11.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb"
|
||||
dependencies = [
|
||||
"instant",
|
||||
"lock_api",
|
||||
"parking_lot_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "parking_lot_core"
|
||||
version = "0.8.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"instant",
|
||||
"libc",
|
||||
"redox_syscall",
|
||||
"smallvec",
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "paste"
|
||||
version = "0.1.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "45ca20c77d80be666aef2b45486da86238fabe33e38306bd3118fe4af33fa880"
|
||||
dependencies = [
|
||||
"paste-impl",
|
||||
"proc-macro-hack",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "paste-impl"
|
||||
version = "0.1.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d95a7db200b97ef370c8e6de0088252f7e0dfff7d047a28528e47456c0fc98b6"
|
||||
dependencies = [
|
||||
"proc-macro-hack",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ppv-lite86"
|
||||
version = "0.2.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro-hack"
|
||||
version = "0.5.19"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5"
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.24"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
|
||||
dependencies = [
|
||||
"unicode-xid",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "proptest"
|
||||
version = "0.10.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "12e6c80c1139113c28ee4670dc50cc42915228b51f56a9e407f0ec60f966646f"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
"byteorder",
|
||||
"lazy_static",
|
||||
"num-traits",
|
||||
"quick-error",
|
||||
"rand",
|
||||
"rand_chacha",
|
||||
"rand_xorshift",
|
||||
"regex-syntax",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pyo3"
|
||||
version = "0.13.2"
|
||||
dependencies = [
|
||||
"assert_approx_eq",
|
||||
"cfg-if",
|
||||
"ctor",
|
||||
"hashbrown",
|
||||
"indoc",
|
||||
"inventory",
|
||||
"libc",
|
||||
"num-bigint",
|
||||
"num-complex",
|
||||
"parking_lot",
|
||||
"paste",
|
||||
"proptest",
|
||||
"pyo3",
|
||||
"pyo3-macros",
|
||||
"rustversion",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"trybuild",
|
||||
"unindent",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pyo3-macros"
|
||||
version = "0.13.2"
|
||||
dependencies = [
|
||||
"pyo3-macros-backend",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "pyo3-macros-backend"
|
||||
version = "0.13.2"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quick-error"
|
||||
version = "1.2.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand"
|
||||
version = "0.7.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
|
||||
dependencies = [
|
||||
"getrandom",
|
||||
"libc",
|
||||
"rand_chacha",
|
||||
"rand_core",
|
||||
"rand_hc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_chacha"
|
||||
version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
|
||||
dependencies = [
|
||||
"ppv-lite86",
|
||||
"rand_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_core"
|
||||
version = "0.5.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
|
||||
dependencies = [
|
||||
"getrandom",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_hc"
|
||||
version = "0.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
|
||||
dependencies = [
|
||||
"rand_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rand_xorshift"
|
||||
version = "0.2.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "77d416b86801d23dde1aa643023b775c3a462efc0ed96443add11546cdf1dca8"
|
||||
dependencies = [
|
||||
"rand_core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rayon"
|
||||
version = "1.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"crossbeam-deque",
|
||||
"either",
|
||||
"rayon-core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rayon-core"
|
||||
version = "1.9.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a"
|
||||
dependencies = [
|
||||
"crossbeam-channel",
|
||||
"crossbeam-deque",
|
||||
"crossbeam-utils",
|
||||
"lazy_static",
|
||||
"num_cpus",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "redox_syscall"
|
||||
version = "0.2.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9"
|
||||
dependencies = [
|
||||
"bitflags",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "regex-syntax"
|
||||
version = "0.6.22"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581"
|
||||
|
||||
[[package]]
|
||||
name = "rustapi-module"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"pyo3",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "rustversion"
|
||||
version = "1.0.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd"
|
||||
|
||||
[[package]]
|
||||
name = "ryu"
|
||||
version = "1.0.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
|
||||
|
||||
[[package]]
|
||||
name = "scopeguard"
|
||||
version = "1.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
|
||||
|
||||
[[package]]
|
||||
name = "serde"
|
||||
version = "1.0.123"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae"
|
||||
dependencies = [
|
||||
"serde_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_derive"
|
||||
version = "1.0.123"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "serde_json"
|
||||
version = "1.0.62"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ea1c6153794552ea7cf7cf63b1231a25de00ec90db326ba6264440fa08e31486"
|
||||
dependencies = [
|
||||
"itoa",
|
||||
"ryu",
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "smallvec"
|
||||
version = "1.6.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "1.0.60"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"unicode-xid",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "termcolor"
|
||||
version = "1.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4"
|
||||
dependencies = [
|
||||
"winapi-util",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "toml"
|
||||
version = "0.5.8"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"
|
||||
dependencies = [
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "trybuild"
|
||||
version = "1.0.41"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "99471a206425fba51842a9186315f32d91c56eadc21ea4c21f847b59cf778f8b"
|
||||
dependencies = [
|
||||
"glob",
|
||||
"lazy_static",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"termcolor",
|
||||
"toml",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "unicode-xid"
|
||||
version = "0.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
|
||||
|
||||
[[package]]
|
||||
name = "unindent"
|
||||
version = "0.1.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f14ee04d9415b52b3aeab06258a3f07093182b88ba0f9b8d203f211a7a7d41c7"
|
||||
|
||||
[[package]]
|
||||
name = "wasi"
|
||||
version = "0.9.0+wasi-snapshot-preview1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
|
||||
|
||||
[[package]]
|
||||
name = "winapi"
|
||||
version = "0.3.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
|
||||
dependencies = [
|
||||
"winapi-i686-pc-windows-gnu",
|
||||
"winapi-x86_64-pc-windows-gnu",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "winapi-i686-pc-windows-gnu"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
|
||||
|
||||
[[package]]
|
||||
name = "winapi-util"
|
||||
version = "0.1.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
|
||||
dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "winapi-x86_64-pc-windows-gnu"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
||||
|
||||
[[package]]
|
||||
name = "word-count"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"pyo3",
|
||||
"rayon",
|
||||
]
|
||||
43
third_party/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/maturin/default.nix
vendored
Normal file
43
third_party/nixpkgs/pkgs/build-support/rust/test/import-cargo-lock/maturin/default.nix
vendored
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
{ lib
|
||||
, fetchFromGitHub
|
||||
, python3
|
||||
, rustPlatform
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonPackage rec {
|
||||
pname = "word-count";
|
||||
version = "0.13.2";
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PyO3";
|
||||
repo = "pyo3";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-NOMrrfo8WjlPhtGxWUOPJS/UDDdbLQRCXR++Zd6JmIA=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
lockFile = ./Cargo.lock;
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
cp ${./Cargo.lock} Cargo.lock
|
||||
'';
|
||||
|
||||
buildAndTestSubdir = "examples/word-count";
|
||||
|
||||
nativeBuildInputs = with rustPlatform; [
|
||||
cargoSetupHook
|
||||
maturinBuildHook
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "word_count" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "PyO3 word count example";
|
||||
homepage = "https://github.com/PyO3/pyo3";
|
||||
license = licenses.asl20;
|
||||
maintainers = [ maintainers.danieldk ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,13 +1,13 @@
|
|||
{ lib, fetchzip }:
|
||||
let
|
||||
version = "2102.25";
|
||||
version = "2105.24";
|
||||
in
|
||||
fetchzip {
|
||||
name = "cascadia-code-${version}";
|
||||
|
||||
url = "https://github.com/microsoft/cascadia-code/releases/download/v${version}/CascadiaCode-${version}.zip";
|
||||
|
||||
sha256 = "14qhawcf1jmv68zdfbi2zfqdw4cf8fpk7plxzphmkqsp7hlw9pzx";
|
||||
sha256 = "sha256-j3IPzrch8oueOmCDa2gpD8uYFs8cKWjkxcmicZcfqQ8=";
|
||||
|
||||
postFetch = ''
|
||||
mkdir -p $out/share/fonts/
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
{ lib, stdenv, fetchurl, gtk-engine-murrine }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nordic-polar";
|
||||
version = "1.9.0";
|
||||
|
||||
srcs = [
|
||||
(fetchurl {
|
||||
url = "https://github.com/EliverLara/Nordic-Polar/releases/download/v${version}/Nordic-Polar.tar.xz";
|
||||
sha256 = "1583mx8frkl5w26myczbyrggrp07lmpsfj00h1bzicw6lz8jbxf1";
|
||||
})
|
||||
(fetchurl {
|
||||
url = "https://github.com/EliverLara/Nordic-Polar/releases/download/v${version}/Nordic-Polar-standard-buttons.tar.xz";
|
||||
sha256 = "1n2qys0xcg1k28bwfrrr44cqz7q2rnfj6ry6qgd67ivgh63kmcq6";
|
||||
})
|
||||
];
|
||||
|
||||
sourceRoot = ".";
|
||||
|
||||
propagatedUserEnvPkgs = [ gtk-engine-murrine ];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out/share/themes
|
||||
cp -a Nordic-Polar* $out/share/themes
|
||||
rm $out/share/themes/*/{LICENSE,README.md}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Gtk theme created using the awesome Nord color pallete";
|
||||
homepage = "https://github.com/EliverLara/Nordic-Polar";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.romildo ];
|
||||
};
|
||||
}
|
||||
|
|
@ -52,6 +52,22 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "09s9y7waygrx3p6c0c4py0ywg2ihpdmx73xhw5f92rr5nhsvish7";
|
||||
name = "Nordic-bluish-accent-standard-buttons";
|
||||
})
|
||||
|
||||
(fetchFromGitHub {
|
||||
owner = "EliverLara";
|
||||
repo = "${pname}-polar";
|
||||
rev = "69652db56e1721ac183cd57d21a801a09655a811";
|
||||
sha256 = "0zjd4np11mjwmc1kh2n1ig77g4wq88s2yrmnga0gvw1lf44n3qn2";
|
||||
name = "Nordic-Polar";
|
||||
})
|
||||
|
||||
(fetchFromGitHub {
|
||||
owner = "EliverLara";
|
||||
repo = "${pname}-polar";
|
||||
rev = "3a67c1a2308ba3e9ec5d82f4a3416f85b6085b08";
|
||||
sha256 = "0gpg2izh4ay78j79vjp4svmi3qy9qaw0n6ai8zwm7p25dwm56fjy";
|
||||
name = "Nordic-Polar-standard-buttons";
|
||||
})
|
||||
];
|
||||
|
||||
sourceRoot = ".";
|
||||
|
|
@ -78,7 +94,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Dark Gtk theme using the Nord color pallete";
|
||||
description = "Gtk themes using the Nord color pallete";
|
||||
homepage = "https://github.com/EliverLara/Nordic";
|
||||
license = licenses.gpl3Only;
|
||||
platforms = platforms.all;
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-freon";
|
||||
version = "40";
|
||||
version = "44";
|
||||
|
||||
uuid = "freon@UshakovVasilii_Github.yahoo.com";
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
|||
owner = "UshakovVasilii";
|
||||
repo = "gnome-shell-extension-freon";
|
||||
rev = "EGO-${version}";
|
||||
sha256 = "0ak6f5dds9kk3kqww681gs3l1mj3vf22icrvb5m257s299rq8yzl";
|
||||
sha256 = "sha256-4DYAIC9N5id3vQe0WaOFP+MymsrPK18hbYqO4DjG+2U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ glib ];
|
||||
|
|
|
|||
|
|
@ -33,10 +33,9 @@ let
|
|||
version = "3.40.0";
|
||||
|
||||
# From data/sessions/Makefile.am
|
||||
requiredComponentsCommon = [
|
||||
"gnome-flashback"
|
||||
"gnome-panel"
|
||||
];
|
||||
requiredComponentsCommon = enableGnomePanel:
|
||||
[ "gnome-flashback" ]
|
||||
++ lib.optional enableGnomePanel "gnome-panel";
|
||||
requiredComponentsGsd = [
|
||||
"org.gnome.SettingsDaemon.A11ySettings"
|
||||
"org.gnome.SettingsDaemon.Color"
|
||||
|
|
@ -55,7 +54,8 @@ let
|
|||
"org.gnome.SettingsDaemon.Wacom"
|
||||
"org.gnome.SettingsDaemon.XSettings"
|
||||
];
|
||||
requiredComponents = wmName: "RequiredComponents=${lib.concatStringsSep ";" ([ wmName ] ++ requiredComponentsCommon ++ requiredComponentsGsd)};";
|
||||
requiredComponents = wmName: enableGnomePanel: "RequiredComponents=${lib.concatStringsSep ";" ([ wmName ] ++ requiredComponentsCommon enableGnomePanel ++ requiredComponentsGsd)};";
|
||||
|
||||
gnome-flashback = stdenv.mkDerivation rec {
|
||||
name = "${pname}-${version}";
|
||||
|
||||
|
|
@ -77,7 +77,7 @@ let
|
|||
postInstall = ''
|
||||
# Check that our expected RequiredComponents match the stock session files, but then don't install them.
|
||||
# They can be installed using mkSessionForWm.
|
||||
grep '${requiredComponents "metacity"}' $out/share/gnome-session/sessions/gnome-flashback-metacity.session || (echo "RequiredComponents have changed, please update gnome-flashback/default.nix."; false)
|
||||
grep '${requiredComponents "metacity" true}' $out/share/gnome-session/sessions/gnome-flashback-metacity.session || (echo "RequiredComponents have changed, please update gnome-flashback/default.nix."; false)
|
||||
|
||||
rm -r $out/share/gnome-session
|
||||
rm -r $out/share/xsessions
|
||||
|
|
@ -126,7 +126,7 @@ let
|
|||
versionPolicy = "odd-unstable";
|
||||
};
|
||||
|
||||
mkSessionForWm = { wmName, wmLabel, wmCommand }:
|
||||
mkSessionForWm = { wmName, wmLabel, wmCommand, enableGnomePanel }:
|
||||
let
|
||||
wmApplication = writeTextFile {
|
||||
name = "gnome-flashback-${wmName}-wm";
|
||||
|
|
@ -151,7 +151,7 @@ let
|
|||
text = ''
|
||||
[GNOME Session]
|
||||
Name=GNOME Flashback (${wmLabel})
|
||||
${requiredComponents wmName}
|
||||
${requiredComponents wmName enableGnomePanel}
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
@ -183,11 +183,11 @@ let
|
|||
providedSessions = [ "gnome-flashback-${wmName}" ];
|
||||
};
|
||||
|
||||
mkSystemdTargetForWm = { wmName }:
|
||||
runCommand "gnome-flashback-${wmName}.target" { } ''
|
||||
mkSystemdTargetForWm = { wmName, wmLabel, wmCommand, enableGnomePanel }:
|
||||
runCommand "gnome-flashback-${wmName}.target" {} ''
|
||||
mkdir -p $out/lib/systemd/user
|
||||
cp "${gnome-flashback}/lib/systemd/user/gnome-session-x11@gnome-flashback-metacity.target" \
|
||||
"$out/lib/systemd/user/gnome-session-x11@gnome-flashback-${wmName}.target"
|
||||
cp -r "${gnome-flashback}/lib/systemd/user/gnome-session@gnome-flashback-metacity.target.d" \
|
||||
"$out/lib/systemd/user/gnome-session@gnome-flashback-${wmName}.target.d"
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,23 @@
|
|||
{ lib, stdenv, pkg-config, fetchFromGitHub, python3, bash, vala_0_48
|
||||
, dockbarx, gtk2, xfce, pythonPackages, wafHook }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, bash
|
||||
, dockbarx
|
||||
, gobject-introspection
|
||||
, keybinder3
|
||||
, pkg-config
|
||||
, python3Packages
|
||||
, vala_0_48
|
||||
, wafHook
|
||||
, wrapGAppsHook
|
||||
, xfce
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "xfce4-dockbarx-plugin";
|
||||
version = "${ver}-${rev}";
|
||||
ver = "0.6";
|
||||
rev = "5213876";
|
||||
rev = "5213876151f1836f044e9902a22d1e682144c1e0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "xuzhen";
|
||||
|
|
@ -14,12 +26,27 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0s8bljn4ga2hj480j0jwkc0npp8szbmirmcsys791gk32iq4dasn";
|
||||
};
|
||||
|
||||
pythonPath = [ dockbarx ];
|
||||
pythonPath = [
|
||||
dockbarx
|
||||
python3Packages.pygobject3
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ pkg-config wafHook ];
|
||||
buildInputs = [ python3 vala_0_48 gtk2 pythonPackages.wrapPython ]
|
||||
++ (with xfce; [ libxfce4util xfce4-panel xfconf xfce4-dev-tools ])
|
||||
++ pythonPath;
|
||||
nativeBuildInputs = [
|
||||
gobject-introspection
|
||||
pkg-config
|
||||
python3Packages.wrapPython
|
||||
vala_0_48
|
||||
wafHook
|
||||
wrapGAppsHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
keybinder3
|
||||
python3Packages.python
|
||||
xfce.xfce4-panel
|
||||
xfce.xfconf
|
||||
]
|
||||
++ pythonPath;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace wscript --replace /usr/share/ "\''${PREFIX}/share/"
|
||||
|
|
@ -28,14 +55,15 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
|
||||
postFixup = ''
|
||||
makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
|
||||
wrapPythonProgramsIn "$out/share/xfce4/panel/plugins" "$out $pythonPath"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/xuzhen/xfce4-dockbarx-plugin";
|
||||
description = "A plugins to embed DockbarX into xfce4-panel";
|
||||
description = "Plugins to embed DockbarX into xfce4-panel";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.volth ];
|
||||
maintainers = [ maintainers.romildo ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,9 +13,11 @@ rec {
|
|||
|
||||
buildRustPackage = callPackage ../../../build-support/rust {
|
||||
inherit cargoBuildHook cargoCheckHook cargoInstallHook cargoSetupHook
|
||||
fetchCargoTarball rustc;
|
||||
fetchCargoTarball importCargoLock rustc;
|
||||
};
|
||||
|
||||
importCargoLock = buildPackages.callPackage ../../../build-support/rust/import-cargo-lock.nix {};
|
||||
|
||||
rustcSrc = callPackage ./rust-src.nix {
|
||||
inherit rustc;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# How to obtain `sha256`:
|
||||
# nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz
|
||||
mkDerivation {
|
||||
version = "1.12.0";
|
||||
sha256 = "sha256-Jnxi0vFYMnwEgTqkPncZbj+cR57hjvH77RCseJdUoFs=";
|
||||
version = "1.12.1";
|
||||
sha256 = "sha256-gRgGXb4btMriQwT/pRIYOJt+NM7rtYBd+A3SKfowC7k=";
|
||||
minimumOTPVersion = "22";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,6 @@
|
|||
# How to obtain `sha256`:
|
||||
# nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz
|
||||
mkDerivation {
|
||||
version = "24.0";
|
||||
sha256 = "0p4p920ncsvls9q3czdc7wz2p7m15bi3nr4306hqddnxz1kxcm4w";
|
||||
version = "24.0.1";
|
||||
sha256 = "z01gaKNkKsIPKdPKhX6IUUY9uBSuyA33E4aVM0MdXsg=";
|
||||
}
|
||||
|
|
|
|||
25
third_party/nixpkgs/pkgs/development/interpreters/python/conda/default.nix
vendored
Normal file
25
third_party/nixpkgs/pkgs/development/interpreters/python/conda/default.nix
vendored
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
{ pkgs }: {
|
||||
|
||||
# List of libraries that are needed for conda binary packages.
|
||||
# When installing a conda binary package, just extend
|
||||
# the `buildInputs` with `condaAutopatchLibs`.
|
||||
condaPatchelfLibs = builtins.map (p: p.lib or p) ([
|
||||
pkgs.alsaLib
|
||||
pkgs.cups
|
||||
pkgs.gcc-unwrapped
|
||||
pkgs.libGL
|
||||
] ++ (with pkgs.xorg; [
|
||||
libSM
|
||||
libICE
|
||||
libX11
|
||||
libXau
|
||||
libXdamage
|
||||
libXi
|
||||
libXrender
|
||||
libXrandr
|
||||
libXcomposite
|
||||
libXcursor
|
||||
libXtst
|
||||
libXScrnSaver])
|
||||
);
|
||||
}
|
||||
|
|
@ -44,6 +44,8 @@ with pkgs;
|
|||
toPythonModule toPythonApplication
|
||||
buildSetupcfg
|
||||
|
||||
condaInstallHook
|
||||
condaUnpackHook
|
||||
eggUnpackHook
|
||||
eggBuildHook
|
||||
eggInstallHook
|
||||
|
|
|
|||
27
third_party/nixpkgs/pkgs/development/interpreters/python/hooks/conda-install-hook.sh
vendored
Normal file
27
third_party/nixpkgs/pkgs/development/interpreters/python/hooks/conda-install-hook.sh
vendored
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
# Setup hook to use in case a conda binary package is installed
|
||||
echo "Sourcing conda install hook"
|
||||
|
||||
condaInstallPhase(){
|
||||
echo "Executing condaInstallPhase"
|
||||
runHook preInstall
|
||||
|
||||
# There are two different formats of conda packages.
|
||||
# It either contains only a site-packages directory
|
||||
# or multiple top level directories.
|
||||
siteDir=@pythonSitePackages@
|
||||
if [ -e ./site-packages ]; then
|
||||
mkdir -p $out/$siteDir
|
||||
cp -r ./site-packages/* $out/$siteDir
|
||||
else
|
||||
cp -r . $out
|
||||
rm $out/env-vars
|
||||
fi
|
||||
|
||||
runHook postInstall
|
||||
echo "Finished executing condaInstallPhase"
|
||||
}
|
||||
|
||||
if [ -z "${installPhase-}" ]; then
|
||||
echo "Using condaInstallPhase"
|
||||
installPhase=condaInstallPhase
|
||||
fi
|
||||
18
third_party/nixpkgs/pkgs/development/interpreters/python/hooks/conda-unpack-hook.sh
vendored
Normal file
18
third_party/nixpkgs/pkgs/development/interpreters/python/hooks/conda-unpack-hook.sh
vendored
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
# Setup hook to use in case a conda binary package is fetched
|
||||
echo "Sourcing conda unpack hook"
|
||||
|
||||
condaUnpackPhase(){
|
||||
echo "Executing condaUnpackPhase"
|
||||
runHook preUnpack
|
||||
|
||||
# use lbzip2 for parallel decompression (bz2 is slow)
|
||||
lbzip2 -dc -n $NIX_BUILD_CORES $src | tar --exclude='info' -x
|
||||
|
||||
# runHook postUnpack # Calls find...?
|
||||
echo "Finished executing condaUnpackPhase"
|
||||
}
|
||||
|
||||
if [ -z "${unpackPhase-}" ]; then
|
||||
echo "Using condaUnpackPhase"
|
||||
unpackPhase=condaUnpackPhase
|
||||
fi
|
||||
|
|
@ -16,6 +16,21 @@ let
|
|||
setuppy = ../run_setup.py;
|
||||
in rec {
|
||||
|
||||
condaInstallHook = callPackage ({ gnutar, lbzip2 }:
|
||||
makeSetupHook {
|
||||
name = "conda-install-hook";
|
||||
deps = [ gnutar lbzip2 ];
|
||||
substitutions = {
|
||||
inherit pythonSitePackages;
|
||||
};
|
||||
} ./conda-install-hook.sh) {};
|
||||
|
||||
condaUnpackHook = callPackage ({}:
|
||||
makeSetupHook {
|
||||
name = "conda-unpack-hook";
|
||||
deps = [];
|
||||
} ./conda-unpack-hook.sh) {};
|
||||
|
||||
eggBuildHook = callPackage ({ }:
|
||||
makeSetupHook {
|
||||
name = "egg-build-hook.sh";
|
||||
|
|
|
|||
|
|
@ -121,4 +121,37 @@ let
|
|||
# in assert myPackages.foobar == myPackages.numpy; myPackages.python.withPackages(ps: with ps; [ foobar ]);
|
||||
};
|
||||
|
||||
in lib.optionalAttrs (stdenv.hostPlatform == stdenv.buildPlatform ) (environmentTests // integrationTests // overrideTests)
|
||||
condaTests = let
|
||||
requests = callPackage ({
|
||||
autoPatchelfHook,
|
||||
fetchurl,
|
||||
pythonCondaPackages,
|
||||
}:
|
||||
python.pkgs.buildPythonPackage {
|
||||
pname = "requests";
|
||||
version = "2.24.0";
|
||||
format = "other";
|
||||
src = fetchurl {
|
||||
url = "https://repo.anaconda.com/pkgs/main/noarch/requests-2.24.0-py_0.tar.bz2";
|
||||
sha256 = "02qzaf6gwsqbcs69pix1fnjxzgnngwzvrsy65h1d521g750mjvvp";
|
||||
};
|
||||
nativeBuildInputs = [ autoPatchelfHook ] ++ (with python.pkgs; [
|
||||
condaUnpackHook condaInstallHook
|
||||
]);
|
||||
buildInputs = [
|
||||
pythonCondaPackages.condaPatchelfLibs
|
||||
];
|
||||
propagatedBuildInputs = with python.pkgs; [
|
||||
chardet idna urllib3 certifi
|
||||
];
|
||||
}
|
||||
) {};
|
||||
pythonWithRequests = requests.pythonModule.withPackages (ps: [ requests ]);
|
||||
in
|
||||
{
|
||||
condaExamplePackage = runCommand "import-requests" {} ''
|
||||
${pythonWithRequests.interpreter} -c "import requests" > $out
|
||||
'';
|
||||
};
|
||||
|
||||
in lib.optionalAttrs (stdenv.hostPlatform == stdenv.buildPlatform ) (environmentTests // integrationTests // overrideTests // condaTests)
|
||||
|
|
|
|||
23
third_party/nixpkgs/pkgs/development/libraries/cgreen/default.nix
vendored
Normal file
23
third_party/nixpkgs/pkgs/development/libraries/cgreen/default.nix
vendored
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{ stdenv, lib, fetchFromGitHub, cmake }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cgreen";
|
||||
version = "1.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cgreen-devs";
|
||||
repo = "cgreen";
|
||||
rev = version;
|
||||
sha256 = "JEpvkM0EZiiQUZRngICNxHbNqS/qjqkEdMPckGbdWac=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/cgreen-devs/cgreen";
|
||||
description = "The Modern Unit Test and Mocking Framework for C and C++";
|
||||
license = licenses.isc;
|
||||
maintainers = [ maintainers.nichtsfrei ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
32
third_party/nixpkgs/pkgs/development/libraries/librttopo/default.nix
vendored
Normal file
32
third_party/nixpkgs/pkgs/development/libraries/librttopo/default.nix
vendored
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitea
|
||||
, autoreconfHook
|
||||
, geos
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "librttopo";
|
||||
version = "1.1.0";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchFromGitea {
|
||||
domain = "git.osgeo.org/gitea";
|
||||
owner = "rttopo";
|
||||
repo = "librttopo";
|
||||
rev = "librttopo-${version}";
|
||||
sha256 = "0h7lzlkn9g4xky6h81ndy0aa6dxz8wb6rnl8v3987jy1i6pr072p";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
buildInputs = [ geos ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "RT Topology Library";
|
||||
homepage = "https://git.osgeo.org/gitea/rttopo/librttopo";
|
||||
license = licenses.gpl2Plus;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,34 +1,54 @@
|
|||
{ stdenv, lib, fetchurl, pkg-config, libxml2, sqlite, zlib, proj, geos, libiconv }:
|
||||
|
||||
with lib;
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, geos
|
||||
, librttopo
|
||||
, libxml2
|
||||
, minizip
|
||||
, proj
|
||||
, sqlite
|
||||
, libiconv
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "libspatialite-4.3.0a";
|
||||
pname = "libspatialite";
|
||||
version = "5.0.1";
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.gaia-gis.it/gaia-sins/libspatialite-sources/${name}.tar.gz";
|
||||
sha256 = "16d4lpl7xrm9zy4gphy6nwanpjp8wn9g4wq2i2kh8abnlhq01448";
|
||||
url = "https://www.gaia-gis.it/gaia-sins/libspatialite-sources/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-7svJQxHHgBLQWevA+uhupe9u7LEzA+boKzdTwbNAnpg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ libxml2 sqlite zlib proj geos libiconv ];
|
||||
buildInputs = [
|
||||
geos
|
||||
librttopo
|
||||
libxml2
|
||||
minizip
|
||||
proj
|
||||
sqlite
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
libiconv
|
||||
];
|
||||
|
||||
configureFlags = [ "--disable-freexl" ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
CFLAGS = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1";
|
||||
|
||||
postInstall = "" + optionalString stdenv.isDarwin ''
|
||||
postInstall = lib.optionalString stdenv.isDarwin ''
|
||||
ln -s $out/lib/mod_spatialite.{so,dylib}
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "Extensible spatial index library in C++";
|
||||
homepage = "https://www.gaia-gis.it/fossil/libspatialite";
|
||||
# They allow any of these
|
||||
license = with licenses; [ gpl2Plus lgpl21Plus mpl11 ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
22
third_party/nixpkgs/pkgs/development/libraries/nv-codec-headers/10_x.nix
vendored
Normal file
22
third_party/nixpkgs/pkgs/development/libraries/nv-codec-headers/10_x.nix
vendored
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{ lib, stdenv, fetchgit }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nv-codec-headers";
|
||||
version = "10.0.26.2";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git";
|
||||
rev = "n${version}";
|
||||
sha256 = "0n5jlwjfv5irx1if1g0n52m279bw7ab6bd3jz2v4vwg9cdzbxx85";
|
||||
};
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
meta = {
|
||||
description = "FFmpeg version of headers for NVENC";
|
||||
homepage = "https://ffmpeg.org/";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = [ lib.maintainers.MP2E ];
|
||||
platforms = lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,4 +1,13 @@
|
|||
{ lib, stdenv, fetchFromGitHub, pkg-config, sqlite, autoreconfHook, libtiff, curl }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, pkg-config
|
||||
, sqlite
|
||||
, libtiff
|
||||
, curl
|
||||
, gtest
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "proj";
|
||||
|
|
@ -11,19 +20,34 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "0mymvfvs8xggl4axvlj7kc1ksd9g94kaz6w1vdv0x2y5mqk93gx9";
|
||||
};
|
||||
|
||||
postPatch = lib.optionalString (version == "7.2.1") ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace "MAJOR 7 MINOR 2 PATCH 0" "MAJOR 7 MINOR 2 PATCH 1"
|
||||
'';
|
||||
|
||||
outputs = [ "out" "dev"];
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
buildInputs = [ sqlite libtiff curl ];
|
||||
|
||||
checkInputs = [ gtest ];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DUSE_EXTERNAL_GTEST=ON"
|
||||
];
|
||||
|
||||
doCheck = stdenv.is64bit;
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$TMPDIR
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Cartographic Projections Library";
|
||||
homepage = "https://proj4.org";
|
||||
license = licenses.mit;
|
||||
platforms = platforms.linux ++ platforms.darwin;
|
||||
maintainers = with maintainers; [ vbgl ];
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ vbgl dotlambda ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,15 +1,40 @@
|
|||
{ lib, stdenv, fetchurl, pkg-config, sqlite, expat, zlib, proj, geos, libspatialite, readosm }:
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, pkg-config
|
||||
, geos
|
||||
, expat
|
||||
, librttopo
|
||||
, libspatialite
|
||||
, libxml2
|
||||
, minizip
|
||||
, proj
|
||||
, readosm
|
||||
, sqlite
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "spatialite-tools-4.1.1";
|
||||
pname = "spatialite-tools";
|
||||
version = "5.0.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.gaia-gis.it/gaia-sins/spatialite-tools-sources/${name}.tar.gz";
|
||||
sha256 = "14aqmhvab63ydbb82fglsbig7jw1wmci8jjvci07aavdhvh1pyrv";
|
||||
url = "https://www.gaia-gis.it/gaia-sins/spatialite-tools-sources/${pname}-${version}.tar.gz";
|
||||
sha256 = "0ckddgdpxhy6vkpr9q2hnx5qmanrd8g4pqnifbrq1i5jrj82s2dd";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ sqlite expat zlib proj geos libspatialite readosm ];
|
||||
|
||||
buildInputs = [
|
||||
expat
|
||||
geos
|
||||
librttopo
|
||||
libspatialite
|
||||
libxml2
|
||||
minizip
|
||||
proj
|
||||
readosm
|
||||
sqlite
|
||||
];
|
||||
|
||||
configureFlags = [ "--disable-freexl" ];
|
||||
|
||||
|
|
@ -17,10 +42,11 @@ stdenv.mkDerivation rec {
|
|||
|
||||
NIX_LDFLAGS = "-lsqlite3";
|
||||
|
||||
meta = {
|
||||
meta = with lib; {
|
||||
description = "A complete sqlite3-compatible CLI front-end for libspatialite";
|
||||
homepage = "https://www.gaia-gis.it/fossil/spatialite-tools";
|
||||
license = with lib.licenses; [ mpl11 gpl2Plus lgpl21Plus ];
|
||||
platforms = lib.platforms.linux;
|
||||
license = with licenses; [ mpl11 gpl2Plus lgpl21Plus ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ dotlambda ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
86
third_party/nixpkgs/pkgs/development/libraries/webkitgtk/428774.patch
vendored
Normal file
86
third_party/nixpkgs/pkgs/development/libraries/webkitgtk/428774.patch
vendored
Normal file
|
|
@ -0,0 +1,86 @@
|
|||
diff -aru a/Source/WebKit/NetworkProcess/ServiceWorker/WebSWOriginStore.cpp b/Source/WebKit/NetworkProcess/ServiceWorker/WebSWOriginStore.cpp
|
||||
--- a/Source/WebKit/NetworkProcess/ServiceWorker/WebSWOriginStore.cpp 2021-02-26 04:57:15.000000000 -0500
|
||||
+++ b/Source/WebKit/NetworkProcess/ServiceWorker/WebSWOriginStore.cpp 2021-05-16 14:45:32.000000000 -0400
|
||||
@@ -87,7 +87,7 @@
|
||||
if (!m_store.createSharedMemoryHandle(handle))
|
||||
return;
|
||||
|
||||
-#if OS(DARWIN) || OS(WINDOWS)
|
||||
+#if (OS(DARWIN) || OS(WINDOWS)) && !USE(UNIX_DOMAIN_SOCKETS)
|
||||
uint64_t dataSize = handle.size();
|
||||
#else
|
||||
uint64_t dataSize = 0;
|
||||
diff -aru a/Source/WebKit/Platform/IPC/IPCSemaphore.cpp b/Source/WebKit/Platform/IPC/IPCSemaphore.cpp
|
||||
--- a/Source/WebKit/Platform/IPC/IPCSemaphore.cpp 2021-02-26 04:57:15.000000000 -0500
|
||||
+++ b/Source/WebKit/Platform/IPC/IPCSemaphore.cpp 2021-05-16 15:54:53.000000000 -0400
|
||||
@@ -26,8 +26,6 @@
|
||||
#include "config.h"
|
||||
#include "IPCSemaphore.h"
|
||||
|
||||
-#if !OS(DARWIN)
|
||||
-
|
||||
namespace IPC {
|
||||
|
||||
Semaphore::Semaphore() = default;
|
||||
@@ -46,5 +44,3 @@
|
||||
}
|
||||
|
||||
}
|
||||
-
|
||||
-#endif
|
||||
diff -aru a/Source/WebKit/Platform/IPC/IPCSemaphore.h b/Source/WebKit/Platform/IPC/IPCSemaphore.h
|
||||
--- a/Source/WebKit/Platform/IPC/IPCSemaphore.h 2021-02-26 04:57:15.000000000 -0500
|
||||
+++ b/Source/WebKit/Platform/IPC/IPCSemaphore.h 2021-05-16 14:46:13.000000000 -0400
|
||||
@@ -29,7 +29,7 @@
|
||||
#include <wtf/Optional.h>
|
||||
#include <wtf/Seconds.h>
|
||||
|
||||
-#if OS(DARWIN)
|
||||
+#if PLATFORM(COCOA)
|
||||
#include <mach/semaphore.h>
|
||||
#include <wtf/MachSendRight.h>
|
||||
#endif
|
||||
@@ -51,7 +51,7 @@
|
||||
void encode(Encoder&) const;
|
||||
static Optional<Semaphore> decode(Decoder&);
|
||||
|
||||
-#if OS(DARWIN)
|
||||
+#if PLATFORM(COCOA)
|
||||
explicit Semaphore(MachSendRight&&);
|
||||
|
||||
void signal();
|
||||
@@ -64,7 +64,7 @@
|
||||
#endif
|
||||
|
||||
private:
|
||||
-#if OS(DARWIN)
|
||||
+#if PLATFORM(COCOA)
|
||||
void destroy();
|
||||
MachSendRight m_sendRight;
|
||||
semaphore_t m_semaphore { SEMAPHORE_NULL };
|
||||
Only in b/Source/WebKit/Platform/IPC: IPCSemaphore.h.orig
|
||||
diff -aru a/Source/WebKit/Platform/SharedMemory.h b/Source/WebKit/Platform/SharedMemory.h
|
||||
--- a/Source/WebKit/Platform/SharedMemory.h 2021-02-26 04:57:15.000000000 -0500
|
||||
+++ b/Source/WebKit/Platform/SharedMemory.h 2021-05-16 14:45:32.000000000 -0400
|
||||
@@ -75,7 +75,7 @@
|
||||
|
||||
bool isNull() const;
|
||||
|
||||
-#if OS(DARWIN) || OS(WINDOWS)
|
||||
+#if (OS(DARWIN) || OS(WINDOWS)) && !USE(UNIX_DOMAIN_SOCKETS)
|
||||
size_t size() const { return m_size; }
|
||||
#endif
|
||||
|
||||
diff -aru a/Source/WebKit/UIProcess/VisitedLinkStore.cpp b/Source/WebKit/UIProcess/VisitedLinkStore.cpp
|
||||
--- a/Source/WebKit/UIProcess/VisitedLinkStore.cpp 2021-02-26 04:57:16.000000000 -0500
|
||||
+++ b/Source/WebKit/UIProcess/VisitedLinkStore.cpp 2021-05-16 14:45:32.000000000 -0400
|
||||
@@ -119,7 +119,7 @@
|
||||
return;
|
||||
|
||||
// FIXME: Get the actual size of data being sent from m_linkHashStore and send it in the SharedMemory::IPCHandle object.
|
||||
-#if OS(DARWIN) || OS(WINDOWS)
|
||||
+#if (OS(DARWIN) || OS(WINDOWS)) && !USE(UNIX_DOMAIN_SOCKETS)
|
||||
uint64_t dataSize = handle.size();
|
||||
#else
|
||||
uint64_t dataSize = 0;
|
||||
Only in b/Source/WebKit/WebProcess/WebPage/CoordinatedGraphics: DrawingAreaCoordinatedGraphics.cpp.orig
|
||||
|
|
@ -1,5 +1,7 @@
|
|||
{ lib, stdenv
|
||||
, runCommandNoCC
|
||||
, fetchurl
|
||||
, fetchpatch
|
||||
, perl
|
||||
, python3
|
||||
, ruby
|
||||
|
|
@ -34,6 +36,7 @@
|
|||
, libidn
|
||||
, libedit
|
||||
, readline
|
||||
, sdk
|
||||
, libGL
|
||||
, libGLU
|
||||
, mesa
|
||||
|
|
@ -78,6 +81,32 @@ stdenv.mkDerivation rec {
|
|||
inherit (addOpenGLRunpath) driverLink;
|
||||
})
|
||||
./libglvnd-headers.patch
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/WebKit/WebKit/commit/94cdcd289b993ed4d39c17d4b8b90db7c81a9b10.diff";
|
||||
sha256 = "sha256-ywrTEjf3ATqI0Vvs60TeAZ+m58kCibum4DamRWrQfaA=";
|
||||
excludes = [ "Source/WebKit/ChangeLog" ];
|
||||
})
|
||||
|
||||
# https://bugs.webkit.org/show_bug.cgi?id=225856
|
||||
(fetchpatch {
|
||||
url = "https://bug-225856-attachments.webkit.org/attachment.cgi?id=428797";
|
||||
sha256 = "sha256-ffo5p2EyyjXe3DxdrvAcDKqxwnoqHtYBtWod+1fOjMU=";
|
||||
excludes = [ "Source/WebCore/ChangeLog" ];
|
||||
})
|
||||
|
||||
# https://bugs.webkit.org/show_bug.cgi?id=225850
|
||||
./428774.patch # https://bug-225850-attachments.webkit.org/attachment.cgi?id=428774
|
||||
(fetchpatch {
|
||||
url = "https://bug-225850-attachments.webkit.org/attachment.cgi?id=428776";
|
||||
sha256 = "sha256-ryNRYMsk72SL0lNdh6eaAdDV3OT8KEqVq1H0j581jmQ=";
|
||||
excludes = [ "Source/WTF/ChangeLog" ];
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://bug-225850-attachments.webkit.org/attachment.cgi?id=428778";
|
||||
sha256 = "sha256-78iP+T2vaIufO8TmIPO/tNDgmBgzlDzalklrOPrtUeo=";
|
||||
excludes = [ "Source/WebKit/ChangeLog" ];
|
||||
})
|
||||
];
|
||||
|
||||
preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
|
||||
|
|
@ -96,6 +125,7 @@ stdenv.mkDerivation rec {
|
|||
gperf
|
||||
ninja
|
||||
perl
|
||||
perl.pkgs.FileCopyRecursive # used by copy-user-interface-resources.pl
|
||||
pkg-config
|
||||
python3
|
||||
ruby
|
||||
|
|
@ -143,6 +173,12 @@ stdenv.mkDerivation rec {
|
|||
]) ++ lib.optionals stdenv.isDarwin [
|
||||
libedit
|
||||
readline
|
||||
# Pull a header that contains a definition of proc_pid_rusage().
|
||||
# (We pick just that one because using the other headers from `sdk` is not
|
||||
# compatible with our C++ standard library)
|
||||
(runCommandNoCC "${pname}_headers" {} ''
|
||||
install -Dm444 "${lib.getDev sdk}"/include/libproc.h "$out"/include/libproc.h
|
||||
'')
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
bubblewrap
|
||||
libseccomp
|
||||
|
|
|
|||
|
|
@ -119,6 +119,10 @@ let
|
|||
'';
|
||||
};
|
||||
|
||||
markdownlint-cli = super.markdownlint-cli.override {
|
||||
meta.mainProgram = "markdownlint";
|
||||
};
|
||||
|
||||
mirakurun = super.mirakurun.override rec {
|
||||
nativeBuildInputs = with pkgs; [ makeWrapper ];
|
||||
postInstall = let
|
||||
|
|
|
|||
|
|
@ -152,6 +152,7 @@
|
|||
, "livedown"
|
||||
, {"lumo-build-deps": "../interpreters/clojurescript/lumo" }
|
||||
, "madoko"
|
||||
, "markdownlint-cli"
|
||||
, "markdown-link-check"
|
||||
, "mastodon-bot"
|
||||
, "mathjax"
|
||||
|
|
|
|||
10869
third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix
generated
vendored
10869
third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix
generated
vendored
File diff suppressed because it is too large
Load diff
19
third_party/nixpkgs/pkgs/development/python-modules/cock/default.nix
vendored
Normal file
19
third_party/nixpkgs/pkgs/development/python-modules/cock/default.nix
vendored
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
{ lib, buildPythonPackage, fetchPypi, locale, pytestCheckHook, click, sortedcontainers, pyyaml }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cock";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1gwaklvwlyvhz2c07hdmhbnqqmpybssxzzr0399dpjk7dgdqgam3";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ click sortedcontainers pyyaml ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/pohmelie/cock";
|
||||
description = "Configuration file with click";
|
||||
license = licenses.mit;
|
||||
};
|
||||
}
|
||||
|
|
@ -5,19 +5,21 @@
|
|||
, setuptools-scm
|
||||
, toml
|
||||
, importlib-metadata
|
||||
, cssselect
|
||||
, lxml
|
||||
, mock
|
||||
, pytestCheckHook
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "cssutils";
|
||||
version = "2.2.0";
|
||||
version = "2.3.0";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "5bef59f6b59bdccbea8e36cb292d2be1b6be1b485fc4a9f5886616f19eb31aaf";
|
||||
sha256 = "sha256-stOxYEfKroLlxZADaTW6+htiHPRcLziIWvS+SDjw/QA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -30,6 +32,8 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
checkInputs = [
|
||||
cssselect
|
||||
lxml
|
||||
mock
|
||||
pytestCheckHook
|
||||
];
|
||||
|
|
@ -38,6 +42,12 @@ buildPythonPackage rec {
|
|||
# access network
|
||||
"test_parseUrl"
|
||||
"encutils"
|
||||
"website.logging"
|
||||
] ++ lib.optionals (pythonOlder "3.9") [
|
||||
# AttributeError: module 'importlib.resources' has no attribute 'files'
|
||||
"test_parseFile"
|
||||
"test_parseString"
|
||||
"test_combine"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "cssutils" ];
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "google-api-python-client";
|
||||
version = "2.0.2";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "04c0c8m4c7lzqv0m3jm0zks9wjcv1myas80rxswvi36wn376qs28";
|
||||
sha256 = "1s1q1nw05925ryvnycq4bmqrxc14cicdl1j4l9xvyis26cjg71va";
|
||||
};
|
||||
|
||||
# No tests included in archive
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "motioneye-client";
|
||||
version = "0.3.6";
|
||||
version = "0.3.8";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
|
|
@ -19,7 +19,7 @@ buildPythonPackage rec {
|
|||
owner = "dermotduffy";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0j28rn7059km7q6z1kalp0pjcrd42wcm5mnbi94j93bvfld97w70";
|
||||
sha256 = "sha256-vTTjH4LhUcbh+/838wR0vnvml2y78Ro8SGwSZ6aApdQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -17,14 +17,14 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyproj";
|
||||
version = "3.0.1";
|
||||
version = "3.1.0";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pyproj4";
|
||||
repo = "pyproj";
|
||||
rev = version;
|
||||
sha256 = "1q1i1235cp3k32dpb11r7krx5rpqwszb89mrx85rflc1z5acaj58";
|
||||
sha256 = "sha256-UN8cJk5Lgd+d2tKmFuF6QvKr36w1435RKovzGfMXi1E=";
|
||||
};
|
||||
|
||||
# force pyproj to use ${proj}
|
||||
|
|
|
|||
57
third_party/nixpkgs/pkgs/development/python-modules/pyroon/default.nix
vendored
Normal file
57
third_party/nixpkgs/pkgs/development/python-modules/pyroon/default.nix
vendored
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, ifaddr
|
||||
, poetry-core
|
||||
, pythonOlder
|
||||
, requests
|
||||
, six
|
||||
, websocket_client
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyroon";
|
||||
version = "0.0.37";
|
||||
format = "pyproject";
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pavoni";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "1hxr473z9h3kb91m3ygina58pfwfyjsv1yb29spxmnbzvk34rzzz";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
poetry-core
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
ifaddr
|
||||
requests
|
||||
six
|
||||
websocket_client
|
||||
];
|
||||
|
||||
patches = [
|
||||
# Switch to poetry-core, https://github.com/pavoni/pyroon/pull/43
|
||||
(fetchpatch {
|
||||
name = "use-peotry-core.patch";
|
||||
url = "https://github.com/pavoni/pyroon/commit/16f890314683a6c2700fa4da5c937559e2e24bea.patch";
|
||||
sha256 = "047bhimr72rwqqyjy7jkfzacdc2ycy81wbmgnvf7xyhgjw1jyvh5";
|
||||
})
|
||||
];
|
||||
|
||||
# Tests require access to the Roon API
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "roonapi" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python library to interface with the Roon API";
|
||||
homepage = "https://github.com/pavoni/pyroon";
|
||||
license = with licenses; [ asl20 ];
|
||||
maintainers = with maintainers; [ fab ];
|
||||
};
|
||||
}
|
||||
|
|
@ -63,6 +63,8 @@ in buildPythonPackage rec {
|
|||
]);
|
||||
propagatedBuildInputs = [ pillow pycairo ];
|
||||
|
||||
pythonImportsCheck = [ "mapnik" ] ;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python bindings for Mapnik";
|
||||
homepage = "https://mapnik.org";
|
||||
|
|
|
|||
|
|
@ -19,14 +19,14 @@ let
|
|||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "ttp";
|
||||
version = "0.7.0";
|
||||
version = "0.7.1";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "dmulyalin";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "0gv1hykbxx3wy195xynqi21rxzlh4701qw01s6pmf3x54w63fz42";
|
||||
sha256 = "1fmg5gz297bpr550s4vfq6vs7j042bp1mrdmqz1b7nz29c2khbz6";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "ytmusicapi";
|
||||
version = "0.17.1";
|
||||
version = "0.17.3";
|
||||
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-b5+AGf9qFqQbx4Rq4RovK2NllYsB+sXVMFU4AvbDkzI=";
|
||||
sha256 = "sha256-miScxT79ZAgDT0AamkN1JyqbM56Otk86LnE6HM0G1Vs=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -18,6 +18,31 @@ stdenv.mkDerivation rec {
|
|||
./fix-unexport-env-test.patch
|
||||
];
|
||||
|
||||
# The generated makefile is a small wrapper for calling ./boot-strap
|
||||
# with a given op. On a case-insensitive filesystem this generated
|
||||
# makefile clobbers a distinct, shipped, Makefile and causes
|
||||
# infinite recursion during tests which eventually fail with
|
||||
# "fork: Resource temporarily unavailable"
|
||||
configureFlags = [
|
||||
"--without-makefile"
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
|
||||
./boot-strap --prefix=$out -o . op=build
|
||||
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
./boot-strap --prefix=$out -o . op=install
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
meta = with lib; {
|
||||
|
|
|
|||
|
|
@ -3,16 +3,16 @@
|
|||
nixosTests }:
|
||||
buildGoModule rec {
|
||||
name = "buildkite-agent-${version}";
|
||||
version = "3.29.0";
|
||||
version = "3.30.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "buildkite";
|
||||
repo = "agent";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-76yyqZi+ktcwRXo0ZIcdFJ9YCuHm9Te4AI+4meuhMNA=";
|
||||
sha256 = "sha256-U2UnT41IpICy08jPQkr25wjAL1kBxiQCD4lysYnLAPk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-6cejbCbr0Rn4jWFJ0fxG4v0L0xUM8k16cbACmcQ6m4o=";
|
||||
vendorSha256 = "sha256-n3XRxpEKjHf7L7fcGscWTVKBtot9waZbLoS9cG0kHfI=";
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace bootstrap/shell/shell.go --replace /bin/bash ${bash}/bin/bash
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "cue";
|
||||
version = "0.3.2";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchgit {
|
||||
url = "https://cue.googlesource.com/cue";
|
||||
rev = "v${version}";
|
||||
sha256 = "0rfgpq4dyd3zm07vcjzn5vv0dhvvryrarxc50sd2pxagbq5cqc8l";
|
||||
sha256 = "sha256-rcGEl+CMFyxZKsOKhVimhv5/ONo3xS6FjgKModZGR2o=";
|
||||
};
|
||||
|
||||
vendorSha256 = "10kvss23a8a6q26a7h1bqc3i0nskm2halsvc9wdv9zf9qsz7zjkp";
|
||||
vendorSha256 = "sha256-eSKVlBgnHR1R0j1lNwtFoIgRuj8GqoMbvuBl/N1SanY=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@ GEM
|
|||
specs:
|
||||
parallel (1.20.1)
|
||||
pg (1.2.3)
|
||||
pgsync (0.6.6)
|
||||
pgsync (0.6.7)
|
||||
parallel
|
||||
pg (>= 0.18.2)
|
||||
slop (>= 4.8.2)
|
||||
tty-spinner
|
||||
slop (4.8.2)
|
||||
slop (4.9.0)
|
||||
tty-cursor (0.7.1)
|
||||
tty-spinner (0.9.3)
|
||||
tty-cursor (~> 0.7)
|
||||
|
|
|
|||
|
|
@ -25,20 +25,20 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0wjvcfsgm7xxhb2lxil19qjxvvihqxbjd2ykmm5d43p0h2l9wvxr";
|
||||
sha256 = "0kn7cf048zwbap0mifdpzz8if1ah803vgzbx09dfgjwgvfx5w5w6";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.6.6";
|
||||
version = "0.6.7";
|
||||
};
|
||||
slop = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "05d1xv8r9cmd0mmlqpa853yzd7xhcyha063w1g8dpf84scxbxmd3";
|
||||
sha256 = "09n6sj4p3b43qq6jmghr9zhgny6719bpca8j6rxnlbq9bsnrd8rj";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.8.2";
|
||||
version = "4.9.0";
|
||||
};
|
||||
tty-cursor = {
|
||||
groups = ["default"];
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "earthly";
|
||||
version = "0.5.13";
|
||||
version = "0.5.14";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "earthly";
|
||||
repo = "earthly";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-XN3E1oCIlohALnaP17WOB7/1vaklmyAfVZLxrBOXhbo=";
|
||||
sha256 = "sha256-XB3zfbcuEgkqQ7DGnyUJj3K+qUH2DNv3n1/0mlocqfM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-q3dDV0eop2NxXHFrlppWsZrO2Hz1q5xhs1DnB6PvG9g=";
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ let
|
|||
in
|
||||
rec {
|
||||
|
||||
electron = electron_12;
|
||||
electron = electron_13;
|
||||
|
||||
electron_3 = mkElectron "3.1.13" {
|
||||
x86_64-linux = "1psmbplz6jhnnf6hmfhxbmmhn4n1dpnhzbc12pxn645xhfpk9ark";
|
||||
|
|
@ -86,32 +86,42 @@ rec {
|
|||
headers = "0yx8mkrm15ha977hzh7g2sc5fab9sdvlk1bk3yxignhxrqqbw885";
|
||||
};
|
||||
|
||||
electron_10 = mkElectron "10.4.5" {
|
||||
x86_64-linux = "d7f6203d09b4419262e985001d4c4f6c1fdfa3150eddb0708df9e124bebd0503";
|
||||
x86_64-darwin = "e3ae7228010055b1d198d8dbaf0f34882d369d8caf76206a59f198301a3f3913";
|
||||
i686-linux = "dd6abc0dc00d8f9d0e31c8f2bb70f7bbbaec58af4c446f8b493bbae9a9428e2f";
|
||||
armv7l-linux = "86bc5f9d3dc94d19e847bf10ab22d98926b616d9febcbdceafd30e35b8f2b2db";
|
||||
aarch64-linux = "655b36d68332131250f7496de0bb03a1e93f74bb5fc4b4286148855874673dcd";
|
||||
headers = "1kfgww8wha86yw75k5yfq4mxvjlxgf1jmmzxy0p3hyr000kw26pk";
|
||||
electron_10 = mkElectron "10.4.7" {
|
||||
x86_64-linux = "e3ea75fcedce588c6b59cfa3a6e46ba67b789e14dc2e5b9dfe1ddf3f82b0f995";
|
||||
x86_64-darwin = "8f01e020563b7fce68dc2e3d4bbf419320d13b088e89eb64f9645e9d73ad88fb";
|
||||
i686-linux = "dd7fde9b3993538333ec701101554050b27d0b680196d0883ab563e8e696fc79";
|
||||
armv7l-linux = "56f11ed14f8a620650d31c21ebd095ce59ef4286c98276802b18f9cc85560ddd";
|
||||
aarch64-linux = "0550584518c8e98fe1113706c10fd7456ec519f7aa6867fbff17c8913327d758";
|
||||
headers = "01x6a0r2jawjpl09ixgzap3g0z6znj34hsnnhzanavkbds0ri4k6";
|
||||
};
|
||||
|
||||
electron_11 = mkElectron "11.4.6" {
|
||||
x86_64-linux = "03932a0b3328a00e7ed49947c70143b7b3455a3c1976defab2f74127cdae43e9";
|
||||
x86_64-darwin = "47de03b17ab20213c95d5817af3d7db2b942908989649202efdcd1d566dd24c3";
|
||||
i686-linux = "b76e69ad4b654384b4f1647f0cb362e78c1d99be7b814d7d32abc22294639ace";
|
||||
armv7l-linux = "cc4be8e0c348bc8db5002cf6c63c1d02fcb594f1f8bfc358168738c930098857";
|
||||
aarch64-linux = "75665dd5b2b9938bb4572344d459db65f46c5f7c637a32946c5a822cc23a77dc";
|
||||
aarch64-darwin = "0c782b1d4eb848bae780f4e3a236caa1671486264c1f8e72fde98f1256d8f9e5";
|
||||
headers = "0ip1wxgflifs86vk4xpz1555xa7yjy64ygqgd5a2g723148m52rk";
|
||||
electron_11 = mkElectron "11.4.7" {
|
||||
x86_64-linux = "05005d351a1b08a550a8186efba6f4fdd96842355a634934d9a9d7d31c2cd539";
|
||||
x86_64-darwin = "e6445ad3d7e851fc3227785788d0706d58c9c8ea3821afa7f871c6254c463043";
|
||||
i686-linux = "5473f36eb2a9772da7e4f1a162a724b4a5335e8f78fb51d585bac3bd50ff12fc";
|
||||
armv7l-linux = "0de0d74b1206f7ffd9e4c75754bbf6fdf27c83a0ce6b4cd8a6b5af81d7a20ba7";
|
||||
aarch64-linux = "f2261dde71197c358aff85d7a320cbd2315a5adf228218fd9a2f5c8561589323";
|
||||
aarch64-darwin = "a2abc83c21402e30f4f42f4615cccc4369884faa2f2fa576d71f423834988622";
|
||||
headers = "1dqkx861vfq6xbzdlbgza6h4j7bib8p3xahllrnfc0s65y8gf0ry";
|
||||
};
|
||||
|
||||
electron_12 = mkElectron "12.0.7" {
|
||||
x86_64-linux = "335b77b35361fac4e2df1b7e8de5cf055e0a1a2065759cb2dd4508e8a77949fa";
|
||||
x86_64-darwin = "c3238c9962c5ad0f9de23c9314f07e03410d096d7e9f9d91016dab2856606a9e";
|
||||
i686-linux = "16023d86b88c7fccafd491c020d064caa2138d6a3493664739714555f72e5b06";
|
||||
armv7l-linux = "53cc1250ff62f2353d8dd37552cbd7bdcaaa756106faee8b809303bed00e040a";
|
||||
aarch64-linux = "3eddc0c507a43cce4e714bfe509d99218b5ab99f4660dd173aac2a895576dc71";
|
||||
aarch64-darwin = "2bc8f37af68e220f93fb9abc62d1c56d8b64baaf0ef9ef974f24ddcbe4f8b488";
|
||||
headers = "1ji9aj7qr4b27m5kprsgsrl21rjphz5bbnmn6q0n2x84l429nyfb";
|
||||
electron_12 = mkElectron "12.0.9" {
|
||||
x86_64-linux = "3ab0a873f720d3bf56cce6ca1bf9d8b956843920798f659ca0829e4cc3126f6d";
|
||||
x86_64-darwin = "b3f1e378f58e7c36b54451c5a3485adc370277827974e1eb0790b6965737c872";
|
||||
i686-linux = "37405b3b27779ad417c3ae432d7f0d969c126c958a0ad8f2585c34fc8ee6c6e6";
|
||||
armv7l-linux = "2d41ef3ed6a215efe2c7d03d8055fcfda0079f09e9580e5bf70e8ac4a22b0898";
|
||||
aarch64-linux = "22a85817ea2edbba2e17b35f6e3a8104b2165e070ea21a1f2fa3b40e8d7aecc9";
|
||||
aarch64-darwin = "cb8aa8153005ea0d801182eb714d56af0217345b1152d867317291670731daeb";
|
||||
headers = "1vwcjzkjag2wxrwnsbi8bgbv8bi6vn5iq9b04krwlk7mlhm4ax66";
|
||||
};
|
||||
|
||||
electron_13 = mkElectron "13.0.1" {
|
||||
x86_64-linux = "05c6cfc2804d426d6c2af15cc16e0265782917e76fb2c4e87b7469d0f3ab0f81";
|
||||
x86_64-darwin = "a65a44bfafcdfcdee0bb2b3515dab57e884e0700830ccd142e15f01e6c3a4976";
|
||||
i686-linux = "3f3b358879523b10e6341a5c74842f8c09a1073f6064410f3495143733663f8d";
|
||||
armv7l-linux = "b6657862bf4b1f61f5c1e0c836401f82822fc5ebd69ecb2efd0777255fefc813";
|
||||
aarch64-linux = "ccc581dc5ddf9d2adefb60d8bc495b5a04363a80614d617094c142b8c5aa95de";
|
||||
aarch64-darwin = "e58e3ea3fffc8c3b280b0b6c22c685f9ecd82ef0340a5207d8b9c6f20e7c0197";
|
||||
headers = "0idlap698vqz7i2by3g9k4yqhm87fqc34pgzxcidzan9qvyd0njx";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,16 +4,16 @@ with lib;
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "kind";
|
||||
version = "0.11.0";
|
||||
version = "0.11.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
owner = "kubernetes-sigs";
|
||||
repo = "kind";
|
||||
sha256 = "020s1fr92lv9yiy5kbnrfb8n0lpslriwyh5z31aym3x44qpc6jaj";
|
||||
sha256 = "sha256-pjg52ONseKNw06EOBzD6Elge+Cz+C3llPvjJPHkn1cw=";
|
||||
};
|
||||
|
||||
vendorSha256 = "08cjvhk587f3aar4drn0hq9q1zlsnl4p7by4j38jzb4r8ix5s98y";
|
||||
vendorSha256 = "sha256-HiVdekSZrC/RkMSvcwm1mv6AE4bA5kayUsMdVCbckiE=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,9 @@ rustPlatform.buildRustPackage rec {
|
|||
buildInputs = [ curl libgit2 openssl ]
|
||||
++ lib.optional stdenv.isDarwin Security;
|
||||
|
||||
doCheck = true;
|
||||
# thread 'main' panicked at 'Cannot ping mock server.: "cannot send request to mock server: cannot send request to mock server: failed to resolve host name"'
|
||||
# __darwinAllowLocalNetworking does not fix the panic
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Generate Bazel BUILD files from Cargo dependencies";
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue