Merge master into haskell-updates
This commit is contained in:
github-actions[bot]
GitHub
commit
ce1777b04a
@ -1019,7 +1019,7 @@ buildPythonPackage rec {
|
||||
|
||||
The `buildPythonPackage` mainly does four things:
|
||||
|
||||
* In the `buildPhase`, it calls `${python.interpreter} setup.py bdist_wheel` to
|
||||
* In the `buildPhase`, it calls `${python.pythonForBuild.interpreter} setup.py bdist_wheel` to
|
||||
build a wheel binary zipfile.
|
||||
* In the `installPhase`, it installs the wheel file using `pip install *.whl`.
|
||||
* In the `postFixup` phase, the `wrapPythonPrograms` bash function is called to
|
||||
@ -1546,7 +1546,7 @@ of such package using the feature is `pkgs/tools/X11/xpra/default.nix`.
|
||||
As workaround install it as an extra `preInstall` step:
|
||||
|
||||
```shell
|
||||
${python.interpreter} setup.py install_data --install-dir=$out --root=$out
|
||||
${python.pythonForBuild.interpreter} setup.py install_data --install-dir=$out --root=$out
|
||||
sed -i '/ = data\_files/d' setup.py
|
||||
```
|
||||
|
||||
@ -1821,6 +1821,11 @@ hosted on GitHub, exporting a `GITHUB_API_TOKEN` is highly recommended.
|
||||
Updating packages in bulk leads to lots of breakages, which is why a
|
||||
stabilization period on the `python-unstable` branch is required.
|
||||
|
||||
If a package is fragile and often breaks during these bulks updates, it
|
||||
may be reasonable to set `passthru.skipBulkUpdate = true` in the
|
||||
derivation. This decision should not be made on a whim and should
|
||||
always be supported by a qualifying comment.
|
||||
|
||||
Once the branch is sufficiently stable it should normally be merged
|
||||
into the `staging` branch.
|
||||
|
||||
|
||||
@ -3663,6 +3663,12 @@
|
||||
github = "Dettorer";
|
||||
githubId = 2761682;
|
||||
};
|
||||
developer-guy = {
|
||||
name = "Batuhan Apaydın";
|
||||
email = "developerguyn@gmail.com";
|
||||
github = "developer-guy";
|
||||
githubId = 16693043;
|
||||
};
|
||||
devhell = {
|
||||
email = ''"^"@regexmail.net'';
|
||||
github = "devhell";
|
||||
@ -10137,6 +10143,12 @@
|
||||
githubId = 3073833;
|
||||
name = "Massimo Redaelli";
|
||||
};
|
||||
mrfreezeex = {
|
||||
email = "arthur@cri.epita.fr";
|
||||
github = "MrFreezeex";
|
||||
name = "Arthur Outhenin-Chalandre";
|
||||
githubId = 14573967;
|
||||
};
|
||||
mrityunjaygr8 = {
|
||||
email = "mrityunjaysaxena1996@gmail.com";
|
||||
github = "mrityunjaygr8";
|
||||
|
||||
@ -32,7 +32,7 @@ lmpfrlib,,,,,5.3,alexshpilkin
|
||||
loadkit,,,,,,alerque
|
||||
lpeg,,,,,,vyp
|
||||
lpeg_patterns,,,,,,
|
||||
lpeglabel,,,,,,
|
||||
lpeglabel,,,,1.6.0,,
|
||||
lpty,,,,,,
|
||||
lrexlib-gnu,,,,,,
|
||||
lrexlib-pcre,,,,,,vyp
|
||||
|
||||
|
@ -1,5 +1,3 @@
|
||||
#!/bin/sh
|
||||
build=`nix-build -E "with import (fetchTarball "channel:nixpkgs-unstable") {}; python3.withPackages(ps: with ps; [ packaging requests toolz ])"`
|
||||
python=${build}/bin/python
|
||||
exec ${python} pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py $@
|
||||
|
||||
#!/usr/bin/env nix-shell
|
||||
#!nix-shell -I nixpkgs=channel:nixpkgs-unstable -i bash -p "python3.withPackages (ps: with ps; [ packaging requests ])" -p nix-prefetch-git
|
||||
exec python3 pkgs/development/interpreters/python/update-python-libraries/update-python-libraries.py $@
|
||||
|
||||
@ -117,6 +117,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
|
||||
- The [services.wordpress.sites.<name>.plugins](#opt-services.wordpress.sites._name_.plugins) and [services.wordpress.sites.<name>.themes](#opt-services.wordpress.sites._name_.themes) options have been converted from sets to attribute sets to allow for consumers to specify explicit install paths via attribute name.
|
||||
|
||||
- `protonmail-bridge` package has been updated to v3.0 and the CLI executable is now named bridge instead of protonmail-bridge to be more in line with upstream.
|
||||
|
||||
- Nebula now runs as a system user and group created for each nebula network, using the `CAP_NET_ADMIN` ambient capability on launch rather than starting as root. Ensure that any files each Nebula instance needs to access are owned by the correct user and group, by default `nebula-${networkName}`.
|
||||
|
||||
- In `mastodon` it is now necessary to specify location of file with `PostgreSQL` database password. In `services.mastodon.database.passwordFile` parameter default value `/var/lib/mastodon/secrets/db-password` has been changed to `null`.
|
||||
@ -257,6 +259,8 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
|
||||
- The `unifi-poller` package and corresponding NixOS module have been renamed to `unpoller` to match upstream.
|
||||
|
||||
- `protonmail-bridge` package has been updated to v3.0 and the CLI executable is now named bridge instead of protonmail-bridge to be more in line with upstream.
|
||||
|
||||
- The new option `services.tailscale.useRoutingFeatures` controls various settings for using Tailscale features like exit nodes and subnet routers. If you wish to use your machine as an exit node, you can set this setting to `server`, otherwise if you wish to use an exit node you can set this setting to `client`. The strict RPF warning has been removed as the RPF will be loosened automatically based on the value of this setting.
|
||||
|
||||
- `openjdk` from version 11 and above is not build with `openjfx` (i.e.: JavaFX) support by default anymore. You can re-enable it by overriding, e.g.: `openjdk11.override { enableJavaFX = true; };`.
|
||||
@ -270,3 +274,5 @@ In addition to numerous new and upgraded packages, this release has the followin
|
||||
- The option `services.nomad.extraSettingsPlugins` has been fixed to allow more than one plugin in the path.
|
||||
|
||||
- The option `services.prometheus.exporters.pihole.interval` does not exist anymore and has been removed.
|
||||
|
||||
- `k3s` can now be configured with an EnvironmentFile for its systemd service, allowing secrets to be provided without ending up in the Nix Store.
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{
|
||||
x86_64-linux = "/nix/store/lsr79q5xqd9dv97wn87x12kzax8s8i1s-nix-2.13.2";
|
||||
i686-linux = "/nix/store/wky9xjwiwzpifgk0s3f2nrg8nr67bi7x-nix-2.13.2";
|
||||
aarch64-linux = "/nix/store/v8drr3x1ia6bdr8y4vl79mlz61xynrpm-nix-2.13.2";
|
||||
x86_64-darwin = "/nix/store/1l14si31p4aw7c1gwgjy0nq55k38j9nj-nix-2.13.2";
|
||||
aarch64-darwin = "/nix/store/6x7nr1r780fgn254zhkwhih3f3i8cr45-nix-2.13.2";
|
||||
x86_64-linux = "/nix/store/mc43d38fibi94pp5crfwacl5gbslccd0-nix-2.13.3";
|
||||
i686-linux = "/nix/store/09m966pj26cgd4ihlg8ihl1106j3vih8-nix-2.13.3";
|
||||
aarch64-linux = "/nix/store/7f191d125akld27gc6jl0r13l8pl7x0h-nix-2.13.3";
|
||||
x86_64-darwin = "/nix/store/1wn9jkvi2zqfjnjgg7lnp30r2q2y8whd-nix-2.13.3";
|
||||
aarch64-darwin = "/nix/store/8w0v2mffa10chrf1h66cbvbpw86qmh85-nix-2.13.3";
|
||||
}
|
||||
|
||||
@ -392,7 +392,7 @@ in
|
||||
tape = 25;
|
||||
video = 26;
|
||||
dialout = 27;
|
||||
polkituser = 28;
|
||||
#polkituser = 28; # currently unused, polkitd doesn't need a group
|
||||
utmp = 29;
|
||||
# ddclient = 30; # converted to DynamicUser = true
|
||||
davfs2 = 31;
|
||||
@ -510,7 +510,6 @@ in
|
||||
#seeks = 148; # removed 2020-06-21
|
||||
prosody = 149;
|
||||
i2pd = 150;
|
||||
systemd-coredump = 151;
|
||||
systemd-network = 152;
|
||||
systemd-resolve = 153;
|
||||
systemd-timesync = 154;
|
||||
|
||||
@ -113,9 +113,7 @@ in
|
||||
group = "polkituser";
|
||||
};
|
||||
|
||||
users.groups.polkituser = {
|
||||
gid = mkIf (lib.versionAtLeast config.system.stateVersion "23.05") config.ids.gids.polkituser;
|
||||
};
|
||||
users.groups.polkituser = {};
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -106,6 +106,14 @@ in
|
||||
description = lib.mdDoc "Only run the server. This option only makes sense for a server.";
|
||||
};
|
||||
|
||||
environmentFile = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
description = lib.mdDoc ''
|
||||
File path containing environment variables for configuring the k3s service in the format of an EnvironmentFile. See systemd.exec(5).
|
||||
'';
|
||||
default = null;
|
||||
};
|
||||
|
||||
configPath = mkOption {
|
||||
type = types.nullOr types.path;
|
||||
default = null;
|
||||
@ -154,6 +162,7 @@ in
|
||||
LimitNPROC = "infinity";
|
||||
LimitCORE = "infinity";
|
||||
TasksMax = "infinity";
|
||||
EnvironmentFile = cfg.environmentFile;
|
||||
ExecStart = concatStringsSep " \\\n " (
|
||||
[
|
||||
"${cfg.package}/bin/k3s ${cfg.role}"
|
||||
|
||||
@ -577,7 +577,7 @@ in {
|
||||
};
|
||||
};
|
||||
# Enable periodic clear-docker-cache script
|
||||
systemd.services.gitlab-runner-clear-docker-cache = {
|
||||
systemd.services.gitlab-runner-clear-docker-cache = mkIf (cfg.clear-docker-cache.enable && (any (s: s.executor == "docker") (attrValues cfg.services))) {
|
||||
description = "Prune gitlab-runner docker resources";
|
||||
restartIfChanged = false;
|
||||
unitConfig.X-StopOnRemoval = false;
|
||||
@ -590,7 +590,7 @@ in {
|
||||
${pkgs.gitlab-runner}/bin/clear-docker-cache ${toString cfg.clear-docker-cache.flags}
|
||||
'';
|
||||
|
||||
startAt = optional cfg.clear-docker-cache.enable cfg.clear-docker-cache.dates;
|
||||
startAt = cfg.clear-docker-cache.dates;
|
||||
};
|
||||
# Enable docker if `docker` executor is used in any service
|
||||
virtualisation.docker.enable = mkIf (
|
||||
|
||||
@ -809,7 +809,7 @@ in
|
||||
// optionalAttrs (cfg.relayHost != "") { relayhost = if cfg.lookupMX
|
||||
then "${cfg.relayHost}:${toString cfg.relayPort}"
|
||||
else "[${cfg.relayHost}]:${toString cfg.relayPort}"; }
|
||||
// optionalAttrs config.networking.enableIPv6 { inet_protocols = mkDefault "all"; }
|
||||
// optionalAttrs (!config.networking.enableIPv6) { inet_protocols = mkDefault "ipv4"; }
|
||||
// optionalAttrs (cfg.networks != null) { mynetworks = cfg.networks; }
|
||||
// optionalAttrs (cfg.networksStyle != "") { mynetworks_style = cfg.networksStyle; }
|
||||
// optionalAttrs (cfg.hostname != "") { myhostname = cfg.hostname; }
|
||||
|
||||
@ -31,7 +31,7 @@ let
|
||||
"m.homeserver".base_url = "https://${fqdn}";
|
||||
"m.identity_server" = {};
|
||||
};
|
||||
serverConfig."m.server" = "${config.services.matrix-synapse.settings.server_name}:443";
|
||||
serverConfig."m.server" = "${fqdn}:443";
|
||||
mkWellKnown = data: ''
|
||||
add_header Content-Type application/json;
|
||||
add_header Access-Control-Allow-Origin *;
|
||||
|
||||
@ -135,7 +135,7 @@ in
|
||||
}
|
||||
{
|
||||
assertion = (cfg.configFile != null) != (cfg.settings != null);
|
||||
message = "You need to either specify services.klipper.settings or services.klipper.defaultConfig.";
|
||||
message = "You need to either specify services.klipper.settings or services.klipper.configFile.";
|
||||
}
|
||||
];
|
||||
|
||||
|
||||
@ -199,12 +199,16 @@ in
|
||||
# java.security.AccessControlException:
|
||||
# access denied ("java.io.FilePermission" "/var/lib/opensearch/config/opensearch.yml" "read")
|
||||
|
||||
rm -f ${configDir}/opensearch.yml
|
||||
cp ${opensearchYml} ${configDir}/opensearch.yml
|
||||
|
||||
# Make sure the logging configuration for old OpenSearch versions is removed:
|
||||
rm -f "${configDir}/logging.yml"
|
||||
rm -f ${configDir}/${loggingConfigFilename}
|
||||
cp ${loggingConfigFile} ${configDir}/${loggingConfigFilename}
|
||||
mkdir -p ${configDir}/scripts
|
||||
|
||||
rm -f ${configDir}/jvm.options
|
||||
cp ${cfg.package}/config/jvm.options ${configDir}/jvm.options
|
||||
|
||||
# redirect jvm logs to the data directory
|
||||
|
||||
@ -66,9 +66,7 @@ in {
|
||||
uid = config.ids.uids.systemd-coredump;
|
||||
group = "systemd-coredump";
|
||||
};
|
||||
users.groups.systemd-coredump = {
|
||||
gid = mkIf (lib.versionAtLeast config.system.stateVersion "23.05") config.ids.gids.systemd-coredump;
|
||||
};
|
||||
users.groups.systemd-coredump = {};
|
||||
})
|
||||
|
||||
(mkIf (!cfg.enable) {
|
||||
|
||||
@ -118,7 +118,7 @@ let
|
||||
name = "initrd-bin-env";
|
||||
paths = map getBin cfg.initrdBin;
|
||||
pathsToLink = ["/bin" "/sbin"];
|
||||
postBuild = concatStringsSep "\n" (mapAttrsToList (n: v: "ln -s '${v}' $out/bin/'${n}'") cfg.extraBin);
|
||||
postBuild = concatStringsSep "\n" (mapAttrsToList (n: v: "ln -sf '${v}' $out/bin/'${n}'") cfg.extraBin);
|
||||
};
|
||||
|
||||
initialRamdisk = pkgs.makeInitrdNG {
|
||||
|
||||
@ -2,7 +2,6 @@ import ./make-test-python.nix ({ pkgs, ...}: {
|
||||
name = "haproxy";
|
||||
nodes = {
|
||||
machine = { ... }: {
|
||||
imports = [ ../modules/profiles/minimal.nix ];
|
||||
services.haproxy = {
|
||||
enable = true;
|
||||
config = ''
|
||||
|
||||
@ -12,7 +12,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
|
||||
{
|
||||
services.redis.servers."".enable = true;
|
||||
|
||||
environment.systemPackages = with pkgs; [ (python38.withPackages (ps: [ ps.twisted ps.txredisapi ps.mock ]))];
|
||||
environment.systemPackages = with pkgs; [ (python3.withPackages (ps: [ ps.twisted ps.txredisapi ps.mock ]))];
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -21,14 +21,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "furnace";
|
||||
version = "0.6pre3";
|
||||
version = "0.6pre4-hotfix";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "tildearrow";
|
||||
repo = "furnace";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-bHVeTw69k6LLcrfkmGxvjlFfR/hWiCfm/P3utknid1o=";
|
||||
sha256 = "sha256-lJtV/0GnWN5mSjv2LaPEMnkuThaNeijBMjLGFPOJX4k=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -3,13 +3,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "opustags";
|
||||
version = "1.6.0";
|
||||
version = "1.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "fmang";
|
||||
repo = "opustags";
|
||||
rev = version;
|
||||
sha256 = "1wsfw713rhi2gg5xc04cx5i31hlw0l3wdflj3r1y8w45bdk6ag1z";
|
||||
sha256 = "sha256-vGMRzw46X3DNRIvlI9XEKoDwiJsVL0v9Nfn8pbszRbw=";
|
||||
};
|
||||
|
||||
buildInputs = [ libogg ];
|
||||
|
||||
@ -10,6 +10,7 @@ let
|
||||
categories = [ "Audio" "AudioVideo" ];
|
||||
icon = "psst";
|
||||
terminal = false;
|
||||
startupWMClass = "psst-gui";
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "pyradio";
|
||||
version = "0.9.0";
|
||||
version = "0.9.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "coderholic";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-8Kr+DRbkTKvhetIIs4htOHlIXGLpoe+T+0yxjm/JcWk=";
|
||||
hash = "sha256-tu/qlrbTcUCIRF15x9ATKHH+LDy1OsGJpo5x+CerTKg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "lighthouse";
|
||||
version = "3.4.0";
|
||||
version = "3.5.0";
|
||||
|
||||
# lighthouse/common/deposit_contract/build.rs
|
||||
depositContractSpecVersion = "0.12.1";
|
||||
@ -30,10 +30,10 @@ rustPlatform.buildRustPackage rec {
|
||||
owner = "sigp";
|
||||
repo = "lighthouse";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4auiM5+kj/HjZKu2YP7JEnwDNxHuL39XCfmV/dc5jLE=";
|
||||
hash = "sha256-09EQr/ghgdcnek0dih0+TXyIh5qwGWmg+nhI8d9n3Jc=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-ihfGwdxL7Ttw86dhaVBp5meb0caXjzgbbP27Io8zv/c=";
|
||||
cargoHash = "sha256-NWG3yIgxfD1GkiQ6TyZF4lNPy9s/i/9TaTujlOtx2NI=";
|
||||
|
||||
buildFeatures = [ "modern" "gnosis" ];
|
||||
|
||||
@ -41,8 +41,8 @@ rustPlatform.buildRustPackage rec {
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [
|
||||
Security
|
||||
] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
|
||||
CoreFoundation SystemConfiguration
|
||||
CoreFoundation
|
||||
SystemConfiguration
|
||||
];
|
||||
|
||||
depositContractSpec = fetchurl {
|
||||
|
||||
@ -12,13 +12,13 @@
|
||||
}:
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "polkadot";
|
||||
version = "0.9.37";
|
||||
version = "0.9.38";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "paritytech";
|
||||
repo = "polkadot";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-/mgJNjliPUmMkhT/1oiX9+BJHfY3SMsKfFv9HCyWRQQ=";
|
||||
hash = "sha256-qS9LZ9KBjOw7hEkUzu7eZFj6ZwbkCDxoqA7FPXb13o4=";
|
||||
|
||||
# the build process of polkadot requires a .git folder in order to determine
|
||||
# the git commit hash that is being built and add it to the version string.
|
||||
@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
|
||||
'';
|
||||
};
|
||||
|
||||
cargoHash = "sha256-o+APFYKgA3zjQSGrkpnyf5LEBBqvZtcfWlzCk6nL02A=";
|
||||
cargoHash = "sha256-4BOgG/NzSppTeEtoEVxqlYjV4FGkNFMeF+qCJwPz+7o=";
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
|
||||
|
||||
|
||||
@ -177,6 +177,23 @@ let
|
||||
|
||||
dune = dontConfigure super.dune;
|
||||
|
||||
emacsql = super.emacsql.overrideAttrs (old: {
|
||||
buildInputs = old.buildInputs ++ [ pkgs.sqlite ];
|
||||
|
||||
postBuild = ''
|
||||
cd source/sqlite
|
||||
make
|
||||
cd -
|
||||
'';
|
||||
|
||||
postInstall = (old.postInstall or "") + "\n" + ''
|
||||
install -m=755 -D source/sqlite/emacsql-sqlite \
|
||||
$out/share/emacs/site-lisp/elpa/emacsql-${old.version}/sqlite/emacsql-sqlite
|
||||
'';
|
||||
|
||||
stripDebugList = [ "share" ];
|
||||
});
|
||||
|
||||
emacsql-sqlite = super.emacsql-sqlite.overrideAttrs (old: {
|
||||
buildInputs = old.buildInputs ++ [ pkgs.sqlite ];
|
||||
|
||||
|
||||
@ -17,13 +17,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "denaro";
|
||||
version = "2023.2.0";
|
||||
version = "2023.2.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "nlogozzo";
|
||||
repo = "NickvisionMoney";
|
||||
rev = version;
|
||||
hash = "sha256-ot6VfCzGrJnLaw658QsOe9M0HiqNDrtxvLWpXj9nXko=";
|
||||
hash = "sha256-B84uzJ+B7kGU+O2tuObrIFCvgUfszLd1VU7F5tL90bU=";
|
||||
};
|
||||
|
||||
dotnet-sdk = dotnetCorePackages.sdk_7_0;
|
||||
|
||||
3
pkgs/applications/finance/denaro/deps.nix
generated
3
pkgs/applications/finance/denaro/deps.nix
generated
@ -21,7 +21,7 @@
|
||||
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2.3"; sha256 = "052d8frpkj4ijs6fm6xp55xbv95b1s9biqwa0w8zp3rgm88m9236"; })
|
||||
(fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.3"; sha256 = "08khd2jqm8sw58ljz5srangzfm2sz3gd2q1jzc5fr80lj8rv6r74"; })
|
||||
(fetchNuGet { pname = "Hazzik.Qif"; version = "1.0.3"; sha256 = "16v6cfy3pa0qy699v843pss3418rvq5agz6n43sikzh69vzl2azy"; })
|
||||
(fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "7.0.2"; sha256 = "0xipbci6pshj825a1r8nlc19hf26n4ba33sx7dbx727ja5lyjv8m"; })
|
||||
(fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "7.0.3"; sha256 = "00rdsirs32vlqpa1hri3f1m368b05d4r0k95wv5n2y0xi5i8lml6"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; })
|
||||
(fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "5.0.0"; sha256 = "0z3qyv7qal5irvabc8lmkh58zsl42mrzd1i0sssvzhv4q4kl3cg6"; })
|
||||
@ -53,7 +53,6 @@
|
||||
(fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.3"; sha256 = "191ajgi6fnfqcvqvkayjsxasiz6l0bv3pps8vv9abbyc4b12qvph"; })
|
||||
(fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.3"; sha256 = "03wwfbarsxjnk70qhqyd1dw65098dncqk2m0vksx92j70i7lry6q"; })
|
||||
(fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlcipher"; version = "2.1.4"; sha256 = "1v9wly6v2bj244wch6ijfx2imrbgmafn1w9km44718fngdxfhysq"; })
|
||||
(fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.2"; sha256 = "19hxv895lairrjmk4gkzd3mcb6b0na45xn4n551h4kckplqadg3d"; })
|
||||
(fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.1.4"; sha256 = "09akxz92qipr1cj8mk2hw99i0b81wwbwx26gpk21471zh543f8ld"; })
|
||||
(fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlcipher"; version = "2.1.4"; sha256 = "14qr84h88jfvy263yx51zjm059aqgwlvgi6g02yxhbr2m7brs4mm"; })
|
||||
(fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlcipher"; version = "2.1.4"; sha256 = "1s1dv1qfgjsvcdbwf2pl48c6k60hkxwyy6z5w8g32fypksnvb7cs"; })
|
||||
|
||||
@ -25,14 +25,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "foxotron";
|
||||
version = "2022-11-02";
|
||||
version = "2023-02-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Gargaj";
|
||||
repo = "Foxotron";
|
||||
rev = version;
|
||||
fetchSubmodules = true;
|
||||
sha256 = "sha256-WjsVvFhwVCzclHxA+Gu2YtR2yK0Opqhncwlg9FEhOLk=";
|
||||
sha256 = "sha256-sPIXLZdtVK3phfMsZrU8o9qisOC5RKvHH19ECXMV0t0=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -9,43 +9,43 @@
|
||||
let
|
||||
|
||||
pname = "1password";
|
||||
version = if channel == "stable" then "8.9.14" else "8.10.0-20.BETA";
|
||||
version = if channel == "stable" then "8.10.0" else "8.10.1-19.BETA";
|
||||
|
||||
sources = {
|
||||
stable = {
|
||||
x86_64-linux = {
|
||||
url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz";
|
||||
sha256 = "sha256-rlLzPDPOmzamDnRxuvgrpAW0QrMINw/PsdLxOiBpMnA=";
|
||||
sha256 = "sha256-mIplIW1XGb7EVlPIHgzL16zvVa/3ypfwTMtVSiSvYYE=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz";
|
||||
sha256 = "sha256-hJTqFr6/KOl4C+1oyo/zrnCbqvRQin6HjyLKOppUl/M=";
|
||||
sha256 = "sha256-xjbqZ/+sw3jBzbqhzd/mP7CZOCLYYi6KpX8Ypy/8/Es=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
|
||||
sha256 = "sha256-3/aiUj+WYZfPItYrYNQKsUSpkRTgOhyb8L5gURt1O74=";
|
||||
sha256 = "sha256-06wOSKzxZ7xVAUyIa4Fv48Z6nbMsQ/o74mEyVkmgkJs=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
|
||||
sha256 = "sha256-n0xqD5WbcC9B6spisa5V7JJRXGZubBwzJFUS8edvz/Q=";
|
||||
sha256 = "sha256-zDu3PBj6kvDVpiFuoOuNlmyiSK4ZVuUWX3rBBwlwEvo=";
|
||||
};
|
||||
};
|
||||
beta = {
|
||||
x86_64-linux = {
|
||||
url = "https://downloads.1password.com/linux/tar/beta/x86_64/1password-${version}.x64.tar.gz";
|
||||
sha256 = "sha256-r2MRyw0dfD3vGnCcPW624K5rSaNSCjTVW4cWFgPAIaY=";
|
||||
sha256 = "sha256-F/dnA9mqtXXp5vx6OQ5aPrdeEBMg9g6nozzMMNAZWHk=";
|
||||
};
|
||||
aarch64-linux = {
|
||||
url = "https://downloads.1password.com/linux/tar/beta/aarch64/1password-${version}.arm64.tar.gz";
|
||||
sha256 = "sha256-98sv4yLvLw8J5uQBB66qTV3lRWnyeZiifhEOW7shz8s=";
|
||||
sha256 = "sha256-u8ktPt7W4teCJoXq1eEdKZCEsKxjhep/7DMHSMtuFBA=";
|
||||
};
|
||||
x86_64-darwin = {
|
||||
url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
|
||||
sha256 = "sha256-ezHk6OgUsmFfMfsY+yyWqn+6JgHSmpkFWGNCCaBv/Bo=";
|
||||
sha256 = "sha256-dZ1Vv4oocDYlw2sibnokUyAKcZ2W7zKofTX2ELamilI=";
|
||||
};
|
||||
aarch64-darwin = {
|
||||
url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
|
||||
sha256 = "sha256-JmCrEBucXGPpGbiKOxA8vu6bUVYsavfsYA5QY58Grnw=";
|
||||
sha256 = "sha256-JA2U/PfW2+qHPjqIGQL5gWIdqtd5G1lL3+hecYh2lcE=";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@ -149,7 +149,7 @@ stdenv.mkDerivation rec {
|
||||
export XDG_DATA_HOME=$out/share
|
||||
export XDG_UTILS_INSTALL_MODE="user"
|
||||
|
||||
${python3Packages.python.interpreter} setup.py install --root=$out \
|
||||
${python3Packages.python.pythonForBuild.interpreter} setup.py install --root=$out \
|
||||
--prefix=$out \
|
||||
--libdir=$out/lib \
|
||||
--staging-root=$out \
|
||||
|
||||
@ -58,5 +58,6 @@ stdenv.mkDerivation rec {
|
||||
maintainers = with maintainers; [ artturin ];
|
||||
# NOTE: CopyQ supports windows and osx, but I cannot test these.
|
||||
platforms = platforms.linux;
|
||||
mainProgram = "copyq";
|
||||
};
|
||||
}
|
||||
|
||||
@ -6,16 +6,22 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "dbx";
|
||||
version = "0.7.6";
|
||||
version = "0.8.8";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "databrickslabs";
|
||||
repo = "dbx";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-P/cniy0xYaDoUbKdvV7KCubCpmOAhYp3cg2VBRA+a6I=";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-nx6fz+atlnB/KxdznnZArHpyv41cuBDQauG0irq1Zyc=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "mlflow-skinny>=1.28.0,<3.0.0" "mlflow" \
|
||||
--replace "rich==12.6.0" "rich"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
aiohttp
|
||||
click
|
||||
@ -34,6 +40,19 @@ python3.pkgs.buildPythonApplication rec {
|
||||
watchdog
|
||||
] ++ typer.optional-dependencies.all;
|
||||
|
||||
passthru.optional-dependencies = with python3.pkgs; {
|
||||
aws = [
|
||||
boto3
|
||||
];
|
||||
azure = [
|
||||
azure-storage-blob
|
||||
azure-identity
|
||||
];
|
||||
gcp = [
|
||||
google-cloud-storage
|
||||
];
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
git
|
||||
] ++ (with python3.pkgs; [
|
||||
@ -43,12 +62,6 @@ python3.pkgs.buildPythonApplication rec {
|
||||
pytestCheckHook
|
||||
]);
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "mlflow-skinny>=1.28.0,<=2.0.0" "mlflow" \
|
||||
--replace "rich==12.5.1" "rich"
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
export HOME=$(mktemp -d)
|
||||
export PATH="$PATH:$out/bin"
|
||||
@ -73,6 +86,7 @@ python3.pkgs.buildPythonApplication rec {
|
||||
meta = with lib; {
|
||||
description = "CLI tool for advanced Databricks jobs management";
|
||||
homepage = "https://github.com/databrickslabs/dbx";
|
||||
changelog = "https://github.com/databrickslabs/dbx/blob/v${version}/CHANGELOG.md";
|
||||
license = licenses.databricks-dbx;
|
||||
maintainers = with maintainers; [ GuillaumeDesforges ];
|
||||
};
|
||||
|
||||
@ -5,10 +5,10 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jotta-cli";
|
||||
version = "0.14.60923";
|
||||
version = "0.15.75988";
|
||||
src = fetchzip {
|
||||
url = "https://repo.jotta.us/archives/linux/${arch}/jotta-cli-${version}_linux_${arch}.tar.gz";
|
||||
sha256 = "sha256-9R2eml0MpOZQn8SIs8gN1d1ddQdKmTsPBEWqHCvW8yo=";
|
||||
sha256 = "sha256-8ldr5FPbnNBlQb4YEbieIu3ZAjCzk5+MKdekq4dsNhc=";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
|
||||
@ -18,14 +18,14 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "qcad";
|
||||
version = "3.27.8.7";
|
||||
version = "3.27.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
name = "qcad-${version}-src";
|
||||
owner = "qcad";
|
||||
repo = "qcad";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-GWDDZzFDOR96ZpmNDUuE+S9zTMVSYFNJKp8z/Cx3hec=";
|
||||
sha256 = "sha256-RpyckKXU8WN/bptKp6G5gNVSU3RzNFYnM0eWLf3E2Yg=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "thedesk";
|
||||
version = "24.0.8";
|
||||
version = "24.0.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/cutls/TheDesk/releases/download/v${version}/${pname}_${version}_amd64.deb";
|
||||
sha256 = "sha256-nxwSJ/rQJYMNrtTWSmqcrJQwMK8zRwIG4jccVyb7OsQ=";
|
||||
sha256 = "sha256-0ZXI3KyRgRHUcRiSNn5a4eSy5Kgcl9HAsP79J2L/vW0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -5,16 +5,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ticker";
|
||||
version = "4.5.5";
|
||||
version = "4.5.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "achannarasappa";
|
||||
repo = pname;
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-7FSyW71NWmWmBNQ5QUqMJ4x9WLXpm0kvvjdjzx1yk/M=";
|
||||
hash = "sha256-h7k/zAYqpCAGn2dW+a3gOF/BN5ywjy/2Yx6THK9zk6k=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-6bosJ2AlbLZ551tCNPmvNyyReFJG+iS3SYUFti2/CAw=";
|
||||
vendorHash = "sha256-c7wU9LLRlS9kOhE4yAiKAs/npQe8lvSwPcd+/D8o9rk=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "zine";
|
||||
version = "0.11.0";
|
||||
version = "0.11.1";
|
||||
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-koN30s+giX4wOp4i5QtTLE/t1ZJ9mP0K0YfY0kTuDJY=";
|
||||
sha256 = "sha256-iva66tN7pMW0LAvhTbL0Tmsvsdq1+96VciTlaNoVywI=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-Re/ooEJCRjQSnz1VSzz4uRWx81yOzChBEeH7gedAHJw=";
|
||||
cargoHash = "sha256-xAA11Og5odn8eNbFNKiRUqLG/MLWPw1WSeNR9zGHs0U=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
|
||||
@ -8,16 +8,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "avalanchego";
|
||||
version = "1.9.8";
|
||||
version = "1.9.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ava-labs";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-5Zyrmo74k6Pl2pyVo3oX/haFsR8mHlM05ubPllintFQ=";
|
||||
hash = "sha256-xaFSqcVVRXy1JYOWGnzoPKLnnxk9NgZ3FIZR3qydOLM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-CpXszXmySPHQehFy6XSOJFXq8ZGixO928+zrP7/vwCQ=";
|
||||
vendorHash = "sha256-ZCIy1cQ62MNLor39Pi0/nU6KsbgG1z7SowMpj9tXLT8=";
|
||||
# go mod vendor has a bug, see: https://github.com/golang/go/issues/57529
|
||||
proxyVendor = true;
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -4,7 +4,7 @@
|
||||
, glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, nss, nspr
|
||||
, libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb
|
||||
, alsa-lib, libXdamage, libXtst, libXrandr, libxshmfence, expat, cups
|
||||
, dbus, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core
|
||||
, dbus, gtk3, gtk4, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core
|
||||
, libkrb5, libdrm, libglvnd, mesa
|
||||
, libxkbcommon, pipewire, wayland # ozone/wayland
|
||||
|
||||
@ -68,7 +68,7 @@ let
|
||||
libxkbcommon pipewire wayland
|
||||
] ++ lib.optional pulseSupport libpulseaudio
|
||||
++ lib.optional libvaSupport libva
|
||||
++ [ gtk3 ];
|
||||
++ [ gtk3 gtk4 ];
|
||||
|
||||
suffix = lib.optionalString (channel != "stable") "-${channel}";
|
||||
|
||||
|
||||
60
pkgs/applications/networking/clash-verge/default.nix
Normal file
60
pkgs/applications/networking/clash-verge/default.nix
Normal file
@ -0,0 +1,60 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, dpkg
|
||||
, wrapGAppsHook
|
||||
, autoPatchelfHook
|
||||
, openssl
|
||||
, webkitgtk
|
||||
, udev
|
||||
, libappindicator-gtk3
|
||||
, libayatana-appindicator
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clash-verge";
|
||||
version = "1.2.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/zzzgydi/clash-verge/releases/download/v${version}/clash-verge_${version}_amd64.deb";
|
||||
hash = "sha256-uiw9kcXJ4ZEu+naUbUrgN/zBYE2bSWVPmMQ+HiAP4D4=";
|
||||
};
|
||||
|
||||
unpackPhase = "dpkg-deb -x $src .";
|
||||
|
||||
nativeBuildInputs = [
|
||||
dpkg
|
||||
wrapGAppsHook
|
||||
autoPatchelfHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
webkitgtk
|
||||
stdenv.cc.cc
|
||||
];
|
||||
|
||||
runtimeDependencies = [
|
||||
(lib.getLib udev)
|
||||
libappindicator-gtk3
|
||||
libayatana-appindicator
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
mv usr/* $out
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A Clash GUI based on tauri";
|
||||
homepage = "https://github.com/zzzgydi/clash-verge";
|
||||
platforms = [ "x86_64-linux" ];
|
||||
license = licenses.gpl3Plus;
|
||||
sourceProvenance = with sourceTypes; [ binaryNativeCode ];
|
||||
maintainers = with maintainers; [ zendo ];
|
||||
};
|
||||
}
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "helmsman";
|
||||
version = "3.16.1";
|
||||
version = "3.16.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Praqma";
|
||||
repo = "helmsman";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-QhAmedSDBi1aRNmp4LR5Xv4HMzcextzT67g9nxN4eko=";
|
||||
sha256 = "sha256-8hv68O4U9bPjqqtVOpmY3DwfeTGEZJGVkzIyYhS14aM=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-bVgYj0e/z57sIvVZXAzLkKqKLa0Pe0CT57Vc7Df1oWE=";
|
||||
vendorHash = "sha256-aSpv4TGp0YLdk/RYEvfYswlEWnv8sy9iflXGGCcKPHs=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -47,7 +47,7 @@ buildGoModule rec {
|
||||
homepage = "https://github.com/GoogleContainerTools/kaniko";
|
||||
license = lib.licenses.asl20;
|
||||
platforms = lib.platforms.linux;
|
||||
maintainers = [ lib.maintainers.superherointj ];
|
||||
maintainers = with lib.maintainers; [ jk superherointj ];
|
||||
mainProgram = "executor";
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
(callPackage ./generic.nix { }) {
|
||||
channel = "edge";
|
||||
version = "23.2.2";
|
||||
sha256 = "1ylimwxp5b7dp14kjl5jimpjiqh5vh83cfah226kxndb6k64i7h8";
|
||||
vendorSha256 = "sha256-UWzWBZBzoq4Mzqk3ukvGAcXqiSeJV/V3K2V1GOA9vwc=";
|
||||
version = "23.2.3";
|
||||
sha256 = "0lqbsh3237hh1rifi7w3h1mq4m6cnpxvb1h3dxghv5sblyivqfz9";
|
||||
vendorSha256 = "sha256-gZ9t10Lj0wXeVBfmxKax9FYrcNL+ZEJOqhQfYw9Qwzw=";
|
||||
}
|
||||
|
||||
@ -2,18 +2,18 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "pv-migrate";
|
||||
version = "1.0.1";
|
||||
version = "1.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "utkuozdemir";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-I66J1/N8Ln7KBQfzg39wdZuM6PeJGn1HiNK2YVzDySw";
|
||||
sha256 = "sha256-M+M2tK40d05AxBmTjYKv5rrebX7g+Za8KX+/Q3aVLwE=";
|
||||
};
|
||||
|
||||
subPackages = [ "cmd/pv-migrate" ];
|
||||
|
||||
vendorSha256 = "sha256-/klqOfM0ZhbzZWOLm0pA0/RB84kvfEzFJN1OQUVSNEA";
|
||||
vendorHash = "sha256-3uqN6RmkctlE4GuYZQbY6wbHyPBJP15O4Bm0kTtW8qo=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@ -693,13 +693,13 @@
|
||||
"vendorHash": "sha256-NXSquRqBaENxWX+ZukDJie/EU+wdEQSxvZQEZqjL+ug="
|
||||
},
|
||||
"lxd": {
|
||||
"hash": "sha256-2YqziG5HZbD/Io/vKYZFZK1PFYVYHOjzHah7s3xEtR0=",
|
||||
"hash": "sha256-4BDpVWfdSYTKPTCgKIHOqgNaxgdIGjW5yRh9Ezs/0zY=",
|
||||
"homepage": "https://registry.terraform.io/providers/terraform-lxd/lxd",
|
||||
"owner": "terraform-lxd",
|
||||
"repo": "terraform-provider-lxd",
|
||||
"rev": "v1.9.0",
|
||||
"rev": "v1.9.1",
|
||||
"spdx": "MPL-2.0",
|
||||
"vendorHash": "sha256-CLr28g/uI9ZU4xIcA76v/BX6gJV91elvFIlYFoSxkfw="
|
||||
"vendorHash": "sha256-RVELewqJtH4tuHJWfcLcMH7cM0dr7Yse+UnqrLaNyCc="
|
||||
},
|
||||
"mailgun": {
|
||||
"hash": "sha256-r1E2Y5JRu77T29ebUNTXUEypnrsfYYbBhvpKZGt5T9w=",
|
||||
|
||||
@ -2,19 +2,19 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "go-graft";
|
||||
version = "0.2.17";
|
||||
version = "0.2.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mzz2017";
|
||||
repo = "gg";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-UhRsgUz9au7e47cS6yrIJXc/8ZxVDpMHWBjoAcw+oCM=";
|
||||
sha256 = "sha256-07fP3dVFs4MZrFOH/8/4e3LHjFGZd7pNu6J3LBOWAd8=";
|
||||
};
|
||||
|
||||
CGO_ENABLED = 0;
|
||||
|
||||
ldflags = [ "-X github.com/mzz2017/gg/cmd.Version=${version}" "-s" "-w" "-buildid=" ];
|
||||
vendorHash = "sha256-EiBt2SxUQY05Wr7KJbK+fs3U3iSmqECJ0glS8B2Ox9Q=";
|
||||
vendorHash = "sha256-fnM4ycqDyruCdCA1Cr4Ki48xeQiTG4l5dLVuAafEm14=";
|
||||
subPackages = [ "." ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -39,7 +39,7 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "armcord";
|
||||
version = "3.1.4";
|
||||
version = "3.1.6";
|
||||
|
||||
src =
|
||||
let
|
||||
@ -48,11 +48,11 @@ stdenv.mkDerivation rec {
|
||||
{
|
||||
x86_64-linux = fetchurl {
|
||||
url = "${base}/v${version}/ArmCord_${version}_amd64.deb";
|
||||
sha256 = "sha256-B/zDcW43ChhnAnGL+UEAt/QChxxEpv+yMgO7WsUi84k=";
|
||||
sha256 = "sha256-xCwAkRtsFmGOIyCftjNqUsaw7/PcxSgWGqW/D1NhC5M=";
|
||||
};
|
||||
aarch64-linux = fetchurl {
|
||||
url = "${base}/v${version}/ArmCord_${version}_arm64.deb";
|
||||
sha256 = "sha256-cFmxs7HeF+jxtmZ827bQbRyuXhQx++x5iTIefZ55928=";
|
||||
sha256 = "sha256-ka8hwHhMVTXNS1rktTs3yXfXnyxSmRt41IE8z/ftUVc=";
|
||||
};
|
||||
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
|
||||
|
||||
|
||||
@ -107,6 +107,8 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}"
|
||||
;
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
env.NIX_CFLAGS_COMPILE = '' -I${librem}/include/rem -I${gsm}/include/gsm
|
||||
-DHAVE_INTTYPES_H -D__GLIBC__
|
||||
-D__need_timeval -D__need_timespec -D__need_time_t '';
|
||||
|
||||
@ -50,7 +50,7 @@ let
|
||||
# find where to edit them.
|
||||
versions.aarch64-darwin = "5.13.7.15481";
|
||||
versions.x86_64-darwin = "5.13.7.15481";
|
||||
versions.x86_64-linux = "5.13.7.683";
|
||||
versions.x86_64-linux = "5.13.10.1208";
|
||||
|
||||
srcs = {
|
||||
aarch64-darwin = fetchurl {
|
||||
@ -64,7 +64,7 @@ let
|
||||
};
|
||||
x86_64-linux = fetchurl {
|
||||
url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
|
||||
hash = "sha256-1aA3W9eXYhjxr39PoTSAVG7mToFInF7uz8MCiJhk/10=";
|
||||
hash = "sha256-GmDWb7HRpf5khA5DAGOD5lx5zSzOdDfTvmcOU/LwN+A=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -15,6 +15,19 @@ let
|
||||
inherit (kubo-migrator-unwrapped) src;
|
||||
sourceRoot = "source/${pname}";
|
||||
vendorSha256 = null;
|
||||
# Fix build on Go 1.17 and later: panic: qtls.ClientHelloInfo doesn't match
|
||||
# See https://github.com/ipfs/fs-repo-migrations/pull/163
|
||||
postPatch = lib.optionalString (lib.elem pname [ "fs-repo-10-to-11" "fs-repo-11-to-12" ]) ''
|
||||
substituteInPlace 'vendor/github.com/marten-seemann/qtls-go1-15/common.go' \
|
||||
--replace \
|
||||
'"container/list"' \
|
||||
'"container/list"
|
||||
"context"' \
|
||||
--replace \
|
||||
'config *Config' \
|
||||
'config *Config
|
||||
ctx context.Context'
|
||||
'';
|
||||
doCheck = false;
|
||||
meta = kubo-migrator-unwrapped.meta // {
|
||||
mainProgram = pname;
|
||||
@ -23,8 +36,9 @@ let
|
||||
};
|
||||
|
||||
# Concatenation of the latest repo version and the version of that migration
|
||||
version = "12.1.0.2";
|
||||
version = "13.1.0.0";
|
||||
|
||||
fs-repo-12-to-13 = fs-repo-common "fs-repo-12-to-13" "1.0.0";
|
||||
fs-repo-11-to-12 = fs-repo-common "fs-repo-11-to-12" "1.0.2";
|
||||
fs-repo-10-to-11 = fs-repo-common "fs-repo-10-to-11" "1.0.1";
|
||||
fs-repo-9-to-10 = fs-repo-common "fs-repo-9-to-10" "1.0.1";
|
||||
@ -39,6 +53,7 @@ let
|
||||
fs-repo-0-to-1 = fs-repo-common "fs-repo-0-to-1" "1.0.1";
|
||||
|
||||
all-migrations = [
|
||||
fs-repo-12-to-13
|
||||
fs-repo-11-to-12
|
||||
fs-repo-10-to-11
|
||||
fs-repo-9-to-10
|
||||
|
||||
@ -15,13 +15,13 @@ buildGoModule rec {
|
||||
# The fs-repo-migrations code itself is the same between
|
||||
# the two versions but the migration code, which is built
|
||||
# into separate binaries, is not.
|
||||
rev = "fs-repo-11-to-12/v1.0.2";
|
||||
sha256 = "sha256-CG4utwH+/+Igw+SP3imhl39wijlB53UGtkJG5Mwh+Ik=";
|
||||
rev = "fs-repo-12-to-13/v1.0.0";
|
||||
hash = "sha256-QQone7E2Be+jVfnrwqQ1Ny4jo6mSDHhaY3ErkNdn2f8=";
|
||||
};
|
||||
|
||||
sourceRoot = "source/fs-repo-migrations";
|
||||
|
||||
vendorSha256 = "sha256-/DqkBBtR/nU8gk3TFqNKY5zQU6BFMc3N8Ti+38mi/jk=";
|
||||
vendorHash = "sha256-/DqkBBtR/nU8gk3TFqNKY5zQU6BFMc3N8Ti+38mi/jk=";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec {
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
postBuild = ''
|
||||
${python3Packages.python.interpreter} setup.py build_sphinx -b html,man
|
||||
${python3Packages.python.pythonForBuild.interpreter} setup.py build_sphinx -b html,man
|
||||
'';
|
||||
|
||||
postInstall = ''
|
||||
|
||||
@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec {
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
${python3Packages.python.interpreter} -O -m compileall .
|
||||
${python3Packages.python.pythonForBuild.interpreter} -O -m compileall .
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec {
|
||||
];
|
||||
|
||||
buildPhase = ''
|
||||
${python3Packages.python.interpreter} -O -m compileall .
|
||||
${python3Packages.python.pythonForBuild.interpreter} -O -m compileall .
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -2,44 +2,51 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "protonmail-bridge";
|
||||
version = "2.3.0";
|
||||
version = "3.0.18";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ProtonMail";
|
||||
repo = "proton-bridge";
|
||||
rev = "br-${version}";
|
||||
sha256 = "sha256-7p+Q6/BphE/dxNQe+gfcIty6TAWHUcPpvSJWfmf4OQg=";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-0gQnMhjwW2NEJwafqndStQ33dIu82lW6ntXFRCpbmm4=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-dhrn6xQ0IJzBYeO6ko2PUCO+idopC2An0ylqCnx5jKg=";
|
||||
vendorHash = "sha256-lHMcVcaoBwjE2ikEZPeZexC5XvhkAtvHnDci7UAa4vg=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
|
||||
buildInputs = [ libsecret ];
|
||||
|
||||
buildPhase = ''
|
||||
runHook preBuild
|
||||
proxyVendor = true; # Bridge uses some C headers so we have to enable proxyVendor
|
||||
|
||||
preBuild = ''
|
||||
patchShebangs ./utils/
|
||||
make BUILD_TIME= -j$NIX_BUILD_CORES build-nogui
|
||||
|
||||
runHook postBuild
|
||||
(cd ./utils/ && ./credits.sh bridge)
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
ldflags =
|
||||
let constants = "github.com/ProtonMail/proton-bridge/v3/internal/constants"; in
|
||||
[
|
||||
"-X ${constants}.Version=${version}"
|
||||
"-X ${constants}.Revision=${src.rev}"
|
||||
"-X ${constants}.buildTime=unknown"
|
||||
"-X ${constants}.FullAppName=ProtonMailBridge" # Should be "Proton Mail Bridge", but quoting doesn't seems to work in nix's ldflags
|
||||
];
|
||||
|
||||
install -Dm555 proton-bridge $out/bin/protonmail-bridge
|
||||
subPackages = [
|
||||
"cmd/Desktop-Bridge"
|
||||
];
|
||||
|
||||
runHook postInstall
|
||||
postInstall = ''
|
||||
mv $out/bin/Desktop-Bridge $out/bin/bridge # The cli is named like that in the upstream repo
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/ProtonMail/proton-bridge";
|
||||
changelog = "https://github.com/ProtonMail/proton-bridge/blob/master/Changelog.md";
|
||||
changelog = "https://github.com/ProtonMail/proton-bridge/blob/${src.rev}/Changelog.md";
|
||||
downloadPage = "https://github.com/ProtonMail/proton-bridge/releases";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ lightdiscord ];
|
||||
maintainers = with maintainers; [ mrfreezeex ];
|
||||
description = "Use your ProtonMail account with your local e-mail client";
|
||||
longDescription = ''
|
||||
An application that runs on your computer in the background and seamlessly encrypts
|
||||
|
||||
@ -12,6 +12,7 @@
|
||||
, dconf
|
||||
, dpkg
|
||||
, fontconfig
|
||||
, gcc-unwrapped
|
||||
, gdk-pixbuf
|
||||
, glib
|
||||
, glibc
|
||||
@ -66,6 +67,7 @@ let
|
||||
runtimeLibs = lib.makeLibraryPath [
|
||||
curl
|
||||
glibc
|
||||
gcc-unwrapped.lib
|
||||
libudev0-shim
|
||||
pulseaudio
|
||||
];
|
||||
|
||||
@ -244,13 +244,13 @@ python.pkgs.buildPythonApplication rec {
|
||||
postBuild = ''
|
||||
# Compile manually because `pythonRecompileBytecodeHook` only works
|
||||
# for files in `python.sitePackages`
|
||||
${python.interpreter} -OO -m compileall src
|
||||
${python.pythonForBuild.interpreter} -OO -m compileall src
|
||||
|
||||
# Collect static files
|
||||
${python.interpreter} src/manage.py collectstatic --clear --no-input
|
||||
${python.pythonForBuild.interpreter} src/manage.py collectstatic --clear --no-input
|
||||
|
||||
# Compile string translations using gettext
|
||||
${python.interpreter} src/manage.py compilemessages
|
||||
${python.pythonForBuild.interpreter} src/manage.py compilemessages
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -12,13 +12,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "treesheets";
|
||||
version = "unstable-2023-02-14";
|
||||
version = "unstable-2023-02-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "aardappel";
|
||||
repo = "treesheets";
|
||||
rev = "16d449a3bf2805c1fc683fdc183e0e8390074252";
|
||||
sha256 = "jm6bLu+6G3VMSyB56B5qATqFZ3sXjm8s66Gx2oZyvFA=";
|
||||
rev = "e2acd675e6aeac609ae071aa169b2661c1fbd862";
|
||||
sha256 = "y7y9DQ6oy/1EuLl4FAkRJd0zzMRm/2OOvnfWtwpf8AU=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, mkDerivation, fetchFromGitHub, cmake, pkg-config
|
||||
, airspy
|
||||
, librtlsdr
|
||||
, rtl-sdr
|
||||
, fdk_aac
|
||||
, faad2
|
||||
, fftwFloat
|
||||
@ -29,7 +29,7 @@ mkDerivation rec {
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [
|
||||
airspy
|
||||
librtlsdr
|
||||
rtl-sdr
|
||||
fdk_aac
|
||||
faad2
|
||||
fftwFloat
|
||||
@ -42,7 +42,7 @@ mkDerivation rec {
|
||||
|
||||
postFixup = ''
|
||||
# guglielmo opens SDR libraries at run time
|
||||
patchelf --add-rpath "${airspy}/lib:${librtlsdr}/lib" $out/bin/.guglielmo-wrapped
|
||||
patchelf --add-rpath "${airspy}/lib:${rtl-sdr}/lib" $out/bin/.guglielmo-wrapped
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -42,13 +42,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "sdrangel";
|
||||
version = "7.9.0";
|
||||
version = "7.10.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "f4exb";
|
||||
repo = "sdrangel";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-lX49R1GhYH45DhxOnn3r6b4VuG8GAissCscv1Qo2GB0=";
|
||||
sha256 = "sha256-hsYt7zGG6CSWeQ9A3GPt65efjZGPu33O5pIhnZjFgmY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
, hackrf_source ? true, hackrf
|
||||
, limesdr_source ? false, limesuite
|
||||
, sddc_source ? false
|
||||
, rtl_sdr_source ? true, librtlsdr, libusb1
|
||||
, rtl_sdr_source ? true, rtl-sdr, libusb1
|
||||
, rtl_tcp_source ? true
|
||||
, sdrplay_source ? false, sdrplay
|
||||
, soapy_source ? true, soapysdr
|
||||
@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optional bladerf_source libbladeRF
|
||||
++ lib.optional hackrf_source hackrf
|
||||
++ lib.optional limesdr_source limesuite
|
||||
++ lib.optionals rtl_sdr_source [ librtlsdr libusb1 ]
|
||||
++ lib.optionals rtl_sdr_source [ rtl-sdr libusb1 ]
|
||||
++ lib.optional sdrplay_source sdrplay
|
||||
++ lib.optional soapy_source soapysdr
|
||||
++ lib.optionals plutosdr_source [ libiio libad9361 ]
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bcftools";
|
||||
version = "1.16";
|
||||
version = "1.17";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/samtools/bcftools/releases/download/${version}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-kL9kfJrXnhCiQ7gFjIc94Ff9cBLiUNWuZXSDl4ei7NY=";
|
||||
sha256 = "sha256-AfddjnAdhbLHWRckEgCcwE8pthYWrOL6dRFhI95Flsw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "diamond";
|
||||
version = "2.1.1";
|
||||
version = "2.1.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bbuchfink";
|
||||
repo = "diamond";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-OT5Fi/rC3VmQ97SuqlXOTf8RAT0Zj4/Oy86T1v7hBkA=";
|
||||
sha256 = "sha256-gvPftUSH+Gnn8LQeORpv7jjHewUKSeo2FVNcoaE2GKU=";
|
||||
};
|
||||
|
||||
|
||||
|
||||
@ -27,7 +27,7 @@ pythonPackages.buildPythonApplication rec {
|
||||
--replace "/bin/bash" "${bash}/bin/bash"
|
||||
mkdir -p "$out/${python.sitePackages}"
|
||||
export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH"
|
||||
${python.interpreter} setup.py install \
|
||||
${python.pythonForBuild.interpreter} setup.py install \
|
||||
--install-lib=$out/${python.sitePackages} \
|
||||
--prefix="$out"
|
||||
'';
|
||||
|
||||
@ -47,7 +47,7 @@ let common = { version, sha256, patches ? [ ], tag ? "z3" }:
|
||||
|
||||
configurePhase = concatStringsSep " "
|
||||
(
|
||||
[ "${python.interpreter} scripts/mk_make.py --prefix=$out" ]
|
||||
[ "${python.pythonForBuild.interpreter} scripts/mk_make.py --prefix=$out" ]
|
||||
++ optional javaBindings "--java"
|
||||
++ optional ocamlBindings "--ml"
|
||||
++ optional pythonBindings "--python --pypkgdir=$out/${python.sitePackages}"
|
||||
|
||||
@ -27,6 +27,7 @@
|
||||
, UserNotifications
|
||||
, nixosTests
|
||||
, runCommand
|
||||
, vulkan-loader
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@ -106,7 +107,10 @@ rustPlatform.buildRustPackage rec {
|
||||
'';
|
||||
|
||||
preFixup = lib.optionalString stdenv.isLinux ''
|
||||
patchelf --add-needed "${libGL}/lib/libEGL.so.1" $out/bin/wezterm-gui
|
||||
patchelf \
|
||||
--add-needed "${libGL}/lib/libEGL.so.1" \
|
||||
--add-needed "${vulkan-loader}/lib/libvulkan.so.1" \
|
||||
$out/bin/wezterm-gui
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
mkdir -p "$out/Applications"
|
||||
OUT_APP="$out/Applications/WezTerm.app"
|
||||
|
||||
@ -26,13 +26,13 @@
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "commitizen";
|
||||
version = "2.42.0";
|
||||
version = "2.42.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "commitizen-tools";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-13WEbF6in+zYZXWYqlYA98qJkKxjmcpQY9GuGS+DDtk=";
|
||||
hash = "sha256-lrZfMqmslwx3B2WkvFosm3EmCHgpZEA/fOzR6UYf6f8=";
|
||||
};
|
||||
|
||||
format = "pyproject";
|
||||
|
||||
@ -8,16 +8,16 @@ with lib;
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gogs";
|
||||
version = "0.12.10";
|
||||
version = "0.13.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "gogs";
|
||||
repo = "gogs";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-EFGC94aIMW7AYJpgaHBT4W7BjXd+oijMqQPH40rIvlg=";
|
||||
sha256 = "sha256-UfxE+NaqDr3XUXpvlV989Iwjq/lsAwpMTDAPkcOmma8=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-5AnQ7zF2UK1HNoyr6gwFdVv+KMJEGkjKPpDEpUXckUg=";
|
||||
vendorSha256 = "sha256-ISJOEJ1DWO4nnMpDuZ36Nq528LhgekDh3XUF8adlj2w=";
|
||||
|
||||
subPackages = [ "." ];
|
||||
|
||||
|
||||
@ -38,13 +38,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "crun";
|
||||
version = "1.8";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containers";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-8R9cja8Blk+7Sp25bJ9t9e0TvazD41livK+KKAwRpLg=";
|
||||
hash = "sha256-Pm96fOfbBqf7mc9llv3sFi00Ioa3f9WNoDmLBPhB2eI=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
|
||||
@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
|
||||
sha256 = "078y14ff9wmmbzq314f7bq1bxx0rc12xy4j362n60iamr56qs4x6";
|
||||
};
|
||||
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
nativeBuildInputs = [ meson ninja pkg-config python3 wayland-scanner ];
|
||||
buildInputs = [
|
||||
cairo colord dbus freerdp lcms2 libGL libXcursor libdrm libevdev libinput
|
||||
|
||||
@ -6,13 +6,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ddccontrol-db";
|
||||
version = "20230124";
|
||||
version = "20230223";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ddccontrol";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-coKdlV2DCZ0S3hg9bQEfE9/FaUbFX5w6IMj/kAqERic=";
|
||||
sha256 = "sha256-ehmMSriBYVOeKbXDybpnbYwBEQJcN0NQJ3zaneMxFmQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook intltool ];
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "wireless-regdb";
|
||||
version = "2022.08.12";
|
||||
version = "2023.02.13";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.kernel.org/pub/software/network/${pname}/${pname}-${version}.tar.xz";
|
||||
sha256 = "sha256-Wcj30Xlm23Gyf5DnNe6PW0LKNSdpSoxebptWvTecO4Q=";
|
||||
sha256 = "sha256-/oHoqGlNxHU6RQh6HEx+G0je5aWfX3ls43TqVQ8LLnM=";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mruby";
|
||||
version = "3.1.0";
|
||||
version = "3.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mruby";
|
||||
repo = "mruby";
|
||||
rev = version;
|
||||
sha256 = "0gnzip7qfadnl0r1k8bpc9a6796sy503h77ggds02wrz7mpq32nf";
|
||||
sha256 = "sha256-MmrbWeg/G29YBvVrOtceTOZChrQ2kx9+apl7u7BiGjA=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ruby bison rake ];
|
||||
@ -24,6 +24,14 @@ stdenv.mkDerivation rec {
|
||||
|
||||
doCheck = true;
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
rake test
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "An embeddable implementation of the Ruby language";
|
||||
homepage = "https://mruby.org";
|
||||
|
||||
@ -46,7 +46,8 @@ in stdenv.mkDerivation rec {
|
||||
++ optionals buildDevDoc [ gtk-doc file docbook_xsl ]
|
||||
;
|
||||
|
||||
doCheck = true;
|
||||
# https://gitlab.freedesktop.org/gstreamer/orc/-/issues/41
|
||||
doCheck = !(stdenv.isLinux && stdenv.isAarch64 && stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12");
|
||||
|
||||
passthru.tests = {
|
||||
inherit (gst_all_1) gst-plugins-good gst-plugins-bad gst-plugins-ugly;
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
diff --git a/Cargo.lock b/Cargo.lock
|
||||
index 05e54911..3a567165 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -1826,6 +1826,7 @@ dependencies = [
|
||||
"futures",
|
||||
"fxhash",
|
||||
"git-version",
|
||||
+ "gmp-mpfr-sys",
|
||||
"hostname",
|
||||
"hyper",
|
||||
"hyper-tls",
|
||||
diff --git a/Cargo.toml b/Cargo.toml
|
||||
index 6e42de23..a50e3d47 100644
|
||||
--- a/Cargo.toml
|
||||
+++ b/Cargo.toml
|
||||
@@ -63,6 +63,7 @@ hyper = { version = "0.14", features = ["full"] }
|
||||
hyper-tls = "0.5.0"
|
||||
tokio = { version = "1", features = ["full"] }
|
||||
futures = "0.3"
|
||||
+gmp-mpfr-sys = { version = "1.4.10", features = ["use-system-libs"] }
|
||||
|
||||
[dev-dependencies]
|
||||
assert_cmd = "1.0.3"
|
||||
@ -1,13 +1,12 @@
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, rustfmt
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, openssl
|
||||
, gmp
|
||||
, libmpc
|
||||
, mpfr
|
||||
, openssl
|
||||
, pkg-config
|
||||
, stdenv
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
@ -21,19 +20,16 @@ rustPlatform.buildRustPackage rec {
|
||||
sha256 = "bDLVOXX9nv6Guu5czRFkviJf7dBiaqt5O8SLUJlcBZo=";
|
||||
};
|
||||
|
||||
cargoPatches = [
|
||||
# Use system openssl, gmp, mpc and mpfr.
|
||||
./cargo.patch
|
||||
];
|
||||
cargoSha256 = "sha256-tv/4GOl93nGLWyoAXY5roxRqS1twskkQTSddltH4n9U=";
|
||||
|
||||
cargoSha256 = "A6HtvxGTjJliDMUSGkQKB13FRyfBU4EPvrlZ97ic0Ic=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config rustfmt];
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ openssl gmp libmpc mpfr ];
|
||||
|
||||
CARGO_FEATURE_USE_SYSTEM_LIBS = true;
|
||||
|
||||
meta = with lib; {
|
||||
broken = stdenv.isDarwin;
|
||||
description = "A modern Prolog implementation written mostly in Rust.";
|
||||
description = "A modern Prolog implementation written mostly in Rust";
|
||||
homepage = "https://github.com/mthom/scryer-prolog";
|
||||
license = with licenses; [ bsd3 ];
|
||||
maintainers = with maintainers; [ malbarbo ];
|
||||
|
||||
@ -1,8 +1,9 @@
|
||||
{ python3, runCommand, git, nix }:
|
||||
{ python3, runCommand, git, nix, nix-prefetch-git }:
|
||||
|
||||
runCommand "update-python-libraries" {
|
||||
buildInputs = [
|
||||
nix
|
||||
nix-prefetch-git
|
||||
(python3.withPackages(ps: with ps; [ packaging requests toolz ]))
|
||||
git
|
||||
];
|
||||
|
||||
@ -12,14 +12,16 @@ to update all non-pinned libraries in that folder.
|
||||
"""
|
||||
|
||||
import argparse
|
||||
import json
|
||||
import logging
|
||||
import os
|
||||
import pathlib
|
||||
import re
|
||||
import requests
|
||||
from concurrent.futures import ThreadPoolExecutor as Pool
|
||||
from packaging.version import Version as _Version
|
||||
from packaging.version import InvalidVersion
|
||||
from packaging.specifiers import SpecifierSet
|
||||
from typing import Optional, Any
|
||||
import collections
|
||||
import subprocess
|
||||
|
||||
@ -31,11 +33,12 @@ EXTENSIONS = ['tar.gz', 'tar.bz2', 'tar', 'zip', '.whl']
|
||||
|
||||
PRERELEASES = False
|
||||
|
||||
BULK_UPDATE = False
|
||||
|
||||
GIT = "git"
|
||||
|
||||
NIXPGKS_ROOT = subprocess.check_output(["git", "rev-parse", "--show-toplevel"]).decode('utf-8').strip()
|
||||
NIXPKGS_ROOT = subprocess.check_output(["git", "rev-parse", "--show-toplevel"]).decode('utf-8').strip()
|
||||
|
||||
import logging
|
||||
logging.basicConfig(level=logging.INFO)
|
||||
|
||||
|
||||
@ -67,6 +70,22 @@ def _get_values(attribute, text):
|
||||
values = regex.findall(text)
|
||||
return values
|
||||
|
||||
|
||||
def _get_attr_value(attr_path: str) -> Optional[Any]:
|
||||
try:
|
||||
response = subprocess.check_output([
|
||||
"nix",
|
||||
"--extra-experimental-features", "nix-command",
|
||||
"eval",
|
||||
"-f", f"{NIXPKGS_ROOT}/default.nix",
|
||||
"--json",
|
||||
f"{attr_path}"
|
||||
])
|
||||
return json.loads(response.decode())
|
||||
except (subprocess.CalledProcessError, ValueError):
|
||||
return None
|
||||
|
||||
|
||||
def _get_unique_value(attribute, text):
|
||||
"""Match attribute in text and return unique match.
|
||||
|
||||
@ -81,23 +100,29 @@ def _get_unique_value(attribute, text):
|
||||
else:
|
||||
raise ValueError("no value found for {}".format(attribute))
|
||||
|
||||
def _get_line_and_value(attribute, text):
|
||||
def _get_line_and_value(attribute, text, value=None):
|
||||
"""Match attribute in text. Return the line and the value of the attribute."""
|
||||
regex = '({}\s+=\s+"(.*)";)'.format(attribute)
|
||||
if value is None:
|
||||
regex = rf'({attribute}\s+=\s+\"(.*)\";)'
|
||||
else:
|
||||
regex = rf'({attribute}\s+=\s+\"({value})\";)'
|
||||
regex = re.compile(regex)
|
||||
value = regex.findall(text)
|
||||
n = len(value)
|
||||
results = regex.findall(text)
|
||||
n = len(results)
|
||||
if n > 1:
|
||||
raise ValueError("found too many values for {}".format(attribute))
|
||||
elif n == 1:
|
||||
return value[0]
|
||||
return results[0]
|
||||
else:
|
||||
raise ValueError("no value found for {}".format(attribute))
|
||||
|
||||
|
||||
def _replace_value(attribute, value, text):
|
||||
def _replace_value(attribute, value, text, oldvalue=None):
|
||||
"""Search and replace value of attribute in text."""
|
||||
old_line, old_value = _get_line_and_value(attribute, text)
|
||||
if oldvalue is None:
|
||||
old_line, old_value = _get_line_and_value(attribute, text)
|
||||
else:
|
||||
old_line, old_value = _get_line_and_value(attribute, text, oldvalue)
|
||||
new_line = old_line.replace(old_value, value)
|
||||
new_text = text.replace(old_line, new_line)
|
||||
return new_text
|
||||
@ -124,6 +149,23 @@ def _fetch_github(url):
|
||||
raise ValueError("request for {} failed".format(url))
|
||||
|
||||
|
||||
def _hash_to_sri(algorithm, value):
|
||||
"""Convert a hash to its SRI representation"""
|
||||
return subprocess.check_output([
|
||||
"nix",
|
||||
"hash",
|
||||
"to-sri",
|
||||
"--type", algorithm,
|
||||
value
|
||||
]).decode().strip()
|
||||
|
||||
|
||||
def _skip_bulk_update(attr_name: str) -> bool:
|
||||
return bool(_get_attr_value(
|
||||
f"{attr_name}.skipBulkUpdate"
|
||||
))
|
||||
|
||||
|
||||
SEMVER = {
|
||||
'major' : 0,
|
||||
'minor' : 1,
|
||||
@ -198,7 +240,7 @@ def _get_latest_version_github(package, extension, current_version, target):
|
||||
attr_path = os.environ.get("UPDATE_NIX_ATTR_PATH", f"python3Packages.{package}")
|
||||
try:
|
||||
homepage = subprocess.check_output(
|
||||
["nix", "eval", "-f", f"{NIXPGKS_ROOT}/default.nix", "--raw", f"{attr_path}.src.meta.homepage"])\
|
||||
["nix", "eval", "-f", f"{NIXPKGS_ROOT}/default.nix", "--raw", f"{attr_path}.src.meta.homepage"])\
|
||||
.decode('utf-8')
|
||||
except Exception as e:
|
||||
raise ValueError(f"Unable to determine homepage: {e}")
|
||||
@ -217,17 +259,47 @@ def _get_latest_version_github(package, extension, current_version, target):
|
||||
|
||||
release = next(filter(lambda x: strip_prefix(x['tag_name']) == version, releases))
|
||||
prefix = get_prefix(release['tag_name'])
|
||||
try:
|
||||
sha256 = subprocess.check_output(["nix-prefetch-url", "--type", "sha256", "--unpack", f"{release['tarball_url']}"], stderr=subprocess.DEVNULL)\
|
||||
.decode('utf-8').strip()
|
||||
except:
|
||||
# this may fail if they have both a branch and a tag of the same name, attempt tag name
|
||||
tag_url = str(release['tarball_url']).replace("tarball","tarball/refs/tags")
|
||||
sha256 = subprocess.check_output(["nix-prefetch-url", "--type", "sha256", "--unpack", tag_url], stderr=subprocess.DEVNULL)\
|
||||
.decode('utf-8').strip()
|
||||
|
||||
# some attributes require using the fetchgit
|
||||
git_fetcher_args = []
|
||||
if (_get_attr_value(f"{attr_path}.src.fetchSubmodules")):
|
||||
git_fetcher_args.append("--fetch-submodules")
|
||||
if (_get_attr_value(f"{attr_path}.src.fetchLFS")):
|
||||
git_fetcher_args.append("--fetch-lfs")
|
||||
if (_get_attr_value(f"{attr_path}.src.leaveDotGit")):
|
||||
git_fetcher_args.append("--leave-dotGit")
|
||||
|
||||
return version, sha256, prefix
|
||||
if git_fetcher_args:
|
||||
algorithm = "sha256"
|
||||
cmd = [
|
||||
"nix-prefetch-git",
|
||||
f"https://github.com/{owner}/{repo}.git",
|
||||
"--hash", algorithm,
|
||||
"--rev", f"refs/tags/{release['tag_name']}"
|
||||
]
|
||||
cmd.extend(git_fetcher_args)
|
||||
response = subprocess.check_output(cmd)
|
||||
document = json.loads(response.decode())
|
||||
hash = _hash_to_sri(algorithm, document[algorithm])
|
||||
else:
|
||||
try:
|
||||
hash = subprocess.check_output([
|
||||
"nix-prefetch-url",
|
||||
"--type", "sha256",
|
||||
"--unpack",
|
||||
f"{release['tarball_url']}"
|
||||
], stderr=subprocess.DEVNULL).decode('utf-8').strip()
|
||||
except (subprocess.CalledProcessError, UnicodeError):
|
||||
# this may fail if they have both a branch and a tag of the same name, attempt tag name
|
||||
tag_url = str(release['tarball_url']).replace("tarball","tarball/refs/tags")
|
||||
hash = subprocess.check_output([
|
||||
"nix-prefetch-url",
|
||||
"--type", "sha256",
|
||||
"--unpack",
|
||||
tag_url
|
||||
], stderr=subprocess.DEVNULL).decode('utf-8').strip()
|
||||
|
||||
return version, hash, prefix
|
||||
|
||||
|
||||
FETCHERS = {
|
||||
@ -272,12 +344,12 @@ def _determine_extension(text, fetcher):
|
||||
if fetcher == 'fetchPypi':
|
||||
try:
|
||||
src_format = _get_unique_value('format', text)
|
||||
except ValueError as e:
|
||||
except ValueError:
|
||||
src_format = None # format was not given
|
||||
|
||||
try:
|
||||
extension = _get_unique_value('extension', text)
|
||||
except ValueError as e:
|
||||
except ValueError:
|
||||
extension = None # extension was not given
|
||||
|
||||
if extension is None:
|
||||
@ -294,8 +366,6 @@ def _determine_extension(text, fetcher):
|
||||
raise ValueError('url does not point to PyPI.')
|
||||
|
||||
elif fetcher == 'fetchFromGitHub':
|
||||
if "fetchSubmodules" in text:
|
||||
raise ValueError("fetchFromGitHub fetcher doesn't support submodules")
|
||||
extension = "tar.gz"
|
||||
|
||||
return extension
|
||||
@ -321,6 +391,8 @@ def _update_package(path, target):
|
||||
# Attempt a fetch using each pname, e.g. backports-zoneinfo vs backports.zoneinfo
|
||||
successful_fetch = False
|
||||
for pname in pnames:
|
||||
if BULK_UPDATE and _skip_bulk_update(f"python3Packages.{pname}"):
|
||||
raise ValueError(f"Bulk update skipped for {pname}")
|
||||
try:
|
||||
new_version, new_sha256, prefix = FETCHERS[fetcher](pname, extension, version, target)
|
||||
successful_fetch = True
|
||||
@ -340,16 +412,20 @@ def _update_package(path, target):
|
||||
raise ValueError("no file available for {}.".format(pname))
|
||||
|
||||
text = _replace_value('version', new_version, text)
|
||||
|
||||
# hashes from pypi are 16-bit encoded sha256's, normalize it to sri to avoid merge conflicts
|
||||
# sri hashes have been the default format since nix 2.4+
|
||||
sri_hash = subprocess.check_output(["nix", "--extra-experimental-features", "nix-command", "hash", "to-sri", "--type", "sha256", new_sha256]).decode('utf-8').strip()
|
||||
sri_hash = _hash_to_sri("sha256", new_sha256)
|
||||
|
||||
|
||||
# fetchers can specify a sha256, or a sri hash
|
||||
try:
|
||||
text = _replace_value('sha256', sri_hash, text)
|
||||
except ValueError:
|
||||
text = _replace_value('hash', sri_hash, text)
|
||||
# retrieve the old output hash for a more precise match
|
||||
if old_hash := _get_attr_value(f"python3Packages.{pname}.src.outputHash"):
|
||||
# fetchers can specify a sha256, or a sri hash
|
||||
try:
|
||||
text = _replace_value('hash', sri_hash, text, old_hash)
|
||||
except ValueError:
|
||||
text = _replace_value('sha256', sri_hash, text, old_hash)
|
||||
else:
|
||||
raise ValueError(f"Unable to retrieve old hash for {pname}")
|
||||
|
||||
if fetcher == 'fetchFromGitHub':
|
||||
# in the case of fetchFromGitHub, it's common to see `rev = version;` or `rev = "v${version}";`
|
||||
@ -441,6 +517,10 @@ environment variables:
|
||||
|
||||
packages = list(map(os.path.abspath, args.package))
|
||||
|
||||
if len(packages) > 1:
|
||||
global BULK_UPDATE
|
||||
BULK_UPDATE = true
|
||||
|
||||
logging.info("Updating packages...")
|
||||
|
||||
# Use threads to update packages concurrently
|
||||
|
||||
@ -59,14 +59,14 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildPhase = with python3.pkgs; ''
|
||||
runHook preBuild
|
||||
${python.interpreter} module/setup.py build --parallel=$NIX_BUILD_CORES
|
||||
${python.pythonForBuild.interpreter} module/setup.py build --parallel=$NIX_BUILD_CORES
|
||||
runHook postBuild
|
||||
'';
|
||||
|
||||
installPhase = with python3.pkgs; ''
|
||||
runHook preInstall
|
||||
|
||||
${python.interpreter} module/setup.py install --prefix=$out
|
||||
${python.pythonForBuild.interpreter} module/setup.py install --prefix=$out
|
||||
mkdir -p $out/share/renpy
|
||||
cp -vr sdk-fonts gui launcher renpy the_question tutorial renpy.py $out/share/renpy
|
||||
|
||||
|
||||
@ -2,17 +2,17 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "wasmtime";
|
||||
version = "5.0.0";
|
||||
version = "6.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bytecodealliance";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-tHGzXjOOOWgYBMA0skLRNFkVgXc3hcs3F1XNsHxDRhk=";
|
||||
hash = "sha256-wCM+axQy5gOHUAThmwPYMt9/HWuIpGcQjMT9TSLqWbk=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
cargoHash = "sha256-92BZdbNz22cZMJkHJwE3lUik6hAhRLCBwYzm2RAvRGo=";
|
||||
cargoHash = "sha256-0RsTE6pcbbUFn7PWg1tNOlvix6TIB5DZxiJQVKU+lKg=";
|
||||
|
||||
cargoBuildFlags = [
|
||||
"--package wasmtime-cli"
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
{
|
||||
mkDerivation,
|
||||
extra-cmake-modules,
|
||||
libdmtx, qrencode, qtbase,
|
||||
libdmtx, qrencode, qtbase, qtmultimedia, zxing-cpp
|
||||
}:
|
||||
|
||||
mkDerivation {
|
||||
pname = "prison";
|
||||
nativeBuildInputs = [ extra-cmake-modules ];
|
||||
buildInputs = [ libdmtx qrencode ];
|
||||
propagatedBuildInputs = [ qtbase ];
|
||||
buildInputs = [ libdmtx qrencode zxing-cpp ];
|
||||
propagatedBuildInputs = [ qtbase qtmultimedia ];
|
||||
outputs = [ "out" "dev" ];
|
||||
}
|
||||
|
||||
@ -63,6 +63,11 @@ stdenv.mkDerivation rec {
|
||||
"--without-ldb-lmdb"
|
||||
];
|
||||
|
||||
# python-config from build Python gives incorrect values when cross-compiling.
|
||||
# If python-config is not found, the build falls back to using the sysconfig
|
||||
# module, which works correctly in all cases.
|
||||
PYTHON_CONFIG = "/invalid";
|
||||
|
||||
stripDebugList = [ "bin" "lib" "modules" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}"
|
||||
++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${lib.getDev stdenv.cc.libc}"
|
||||
;
|
||||
enableParallelBuilding = true;
|
||||
meta = {
|
||||
description = "A library for real-time communications with async IO support and a complete SIP stack";
|
||||
homepage = "https://github.com/baresip/re";
|
||||
|
||||
@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${lib.getDev stdenv.cc.cc}"
|
||||
++ lib.optional (stdenv.cc.libc != null) "SYSROOT=${lib.getDev stdenv.cc.libc}"
|
||||
;
|
||||
enableParallelBuilding = true;
|
||||
meta = {
|
||||
description = "A library for real-time audio and video processing";
|
||||
homepage = "https://github.com/baresip/rem";
|
||||
|
||||
37
pkgs/development/libraries/libwacom/surface.nix
Normal file
37
pkgs/development/libraries/libwacom/surface.nix
Normal file
@ -0,0 +1,37 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, libwacom
|
||||
}:
|
||||
|
||||
let
|
||||
libwacom-surface = fetchFromGitHub {
|
||||
owner = "linux-surface";
|
||||
repo = "libwacom-surface";
|
||||
rev = "v2.6.0-1";
|
||||
hash = "sha256-4UOO9LMyCJd4LkqU0uva/0Xc44fIVdIQi27tJOtNEFk=";
|
||||
};
|
||||
in libwacom.overrideAttrs (old: {
|
||||
pname = "libwacom-surface";
|
||||
|
||||
# These patches will not be included upstream:
|
||||
# https://github.com/linux-surface/libwacom/issues/2
|
||||
patches = old.patches or [ ] ++ map (p: "${libwacom-surface}/patches/v2/${p}") [
|
||||
"0001-Add-support-for-BUS_VIRTUAL.patch"
|
||||
"0002-Add-support-for-Intel-Management-Engine-bus.patch"
|
||||
"0003-data-Add-Microsoft-Surface-Pro-3.patch"
|
||||
"0004-data-Add-Microsoft-Surface-Pro-4.patch"
|
||||
"0005-data-Add-Microsoft-Surface-Pro-5.patch"
|
||||
"0006-data-Add-Microsoft-Surface-Pro-6.patch"
|
||||
"0007-data-Add-Microsoft-Surface-Pro-7.patch"
|
||||
"0008-data-Add-Microsoft-Surface-Book.patch"
|
||||
"0009-data-Add-Microsoft-Surface-Book-2-13.5.patch"
|
||||
"0010-data-Add-Microsoft-Surface-Book-2-15.patch"
|
||||
"0011-data-Add-Microsoft-Surface-Book-3-13.5.patch"
|
||||
"0012-data-Add-Microsoft-Surface-Book-3-15.patch"
|
||||
];
|
||||
|
||||
meta = old.meta // {
|
||||
homepage = "https://github.com/linux-surface/libwacom-surface";
|
||||
maintainers = with lib.maintainers; [ dotlambda ];
|
||||
};
|
||||
})
|
||||
@ -17,10 +17,11 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ cmake ninja ];
|
||||
buildInputs = [ netcdf hdf5 curl ];
|
||||
|
||||
# 10 - cxx4_test_filter (Failed)
|
||||
# Setting Filter....Caught unexpected exception.
|
||||
doCheck = false;
|
||||
doCheck = true;
|
||||
enableParallelChecking = false;
|
||||
preCheck = ''
|
||||
export HDF5_PLUGIN_PATH=${netcdf}/lib/hdf5-plugins
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "C++ API to manipulate netcdf files";
|
||||
|
||||
@ -1,6 +1,11 @@
|
||||
{ lib, stdenv
|
||||
, fetchurl, unzip
|
||||
, hdf5
|
||||
, bzip2
|
||||
, libzip
|
||||
, zstd
|
||||
, szipSupport ? false
|
||||
, szip
|
||||
, libxml2
|
||||
, m4
|
||||
, curl # for DAP
|
||||
@ -34,7 +39,10 @@ in stdenv.mkDerivation rec {
|
||||
hdf5
|
||||
libxml2
|
||||
mpi
|
||||
];
|
||||
bzip2
|
||||
libzip
|
||||
zstd
|
||||
] ++ lib.optional szipSupport szip;
|
||||
|
||||
passthru = {
|
||||
inherit mpiSupport mpi;
|
||||
@ -45,9 +53,12 @@ in stdenv.mkDerivation rec {
|
||||
"--enable-dap"
|
||||
"--enable-shared"
|
||||
"--disable-dap-remote-tests"
|
||||
"--with-plugin-dir=${placeholder "out"}/lib/hdf5-plugins"
|
||||
]
|
||||
++ (lib.optionals mpiSupport [ "--enable-parallel-tests" "CC=${mpi}/bin/mpicc" ]);
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
disallowedReferences = [ stdenv.cc ];
|
||||
|
||||
postFixup = ''
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rocblas";
|
||||
version = "5.4.2";
|
||||
version = "5.4.3";
|
||||
|
||||
outputs = [
|
||||
"out"
|
||||
@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "ROCmSoftwarePlatform";
|
||||
repo = "rocBLAS";
|
||||
rev = "rocm-${finalAttrs.version}";
|
||||
hash = "sha256-4art8/KwH2KDLwSYcyzn/m/xwdg5wQQvgHks73aB+60=";
|
||||
hash = "sha256-XhYpzBXviMnUdbF6lZi9g0LARKpzWLtDxJxLI3MuHiM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -8,13 +8,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "rocclr";
|
||||
version = "5.4.2";
|
||||
version = "5.4.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ROCm-Developer-Tools";
|
||||
repo = "ROCclr";
|
||||
rev = "rocm-${finalAttrs.version}";
|
||||
hash = "sha256-tYFoGafOsJYnRQaOLAaFix6tPD0QPTidOtOicPxP2Vk=";
|
||||
hash = "sha256-DbN7kL8oyaPeYQB19Q96L3wX66v62TMSWl0Yor7Q4kE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -82,8 +82,8 @@ stdenv.mkDerivation rec {
|
||||
export OPENMM_LIB_PATH=$out/lib
|
||||
export OPENMM_INCLUDE_PATH=$out/include
|
||||
cd python
|
||||
${python3Packages.python.interpreter} setup.py build
|
||||
${python3Packages.python.interpreter} setup.py install --prefix=$out
|
||||
${python3Packages.python.pythonForBuild.interpreter} setup.py build
|
||||
${python3Packages.python.pythonForBuild.interpreter} setup.py install --prefix=$out
|
||||
'';
|
||||
|
||||
postFixup = ''
|
||||
|
||||
@ -1,83 +1,53 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, fetchurl
|
||||
, cmake
|
||||
, ninja
|
||||
, gfortran
|
||||
, libpthreadstubs
|
||||
, lapack
|
||||
, blas
|
||||
, cudaPackages
|
||||
, hip
|
||||
, hipblas
|
||||
, hipsparse
|
||||
, openmp
|
||||
, useCUDA ? true
|
||||
, useROCM ? false
|
||||
, gpuTargets ? [ ]
|
||||
args@{ callPackage
|
||||
, lib
|
||||
, ...
|
||||
}:
|
||||
|
||||
# Type aliases
|
||||
# Release = {
|
||||
# version: String
|
||||
# hash: String
|
||||
# supportedGpuTargets: List String
|
||||
# }
|
||||
|
||||
let
|
||||
inherit (cudaPackages) cudatoolkit cudaFlags;
|
||||
in stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "magma";
|
||||
version = "2.6.2";
|
||||
inherit (lib) lists strings trivial;
|
||||
|
||||
src = fetchurl {
|
||||
name = "magma-${finalAttrs.version}.tar.gz";
|
||||
url = "https://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-dbVU2rAJA+LRC5cskT5Q5/iMvGLzrkMrWghsfk7aCnE=";
|
||||
computeName = version: "magma_${strings.replaceStrings [ "." ] [ "_" ] version}";
|
||||
|
||||
# buildMagmaPackage :: Release -> Derivation
|
||||
buildMagmaPackage = magmaRelease: callPackage ./generic.nix (
|
||||
(builtins.removeAttrs args [ "callPackage" ]) // {
|
||||
inherit magmaRelease;
|
||||
}
|
||||
);
|
||||
|
||||
# Reverse the list to have the latest release first
|
||||
# magmaReleases :: List Release
|
||||
magmaReleases = lists.reverseList (builtins.import ./releases.nix);
|
||||
|
||||
# The latest release is the first element of the list and will be our default choice
|
||||
# latestReleaseName :: String
|
||||
latestReleaseName = computeName (builtins.head magmaReleases).version;
|
||||
|
||||
# Function to transform our releases into build attributes
|
||||
# toBuildAttrs :: Release -> { name: String, value: Derivation }
|
||||
toBuildAttrs = release: {
|
||||
name = computeName release.version;
|
||||
value = buildMagmaPackage release;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
gfortran
|
||||
];
|
||||
# Add all supported builds as attributes
|
||||
# allBuilds :: AttrSet String Derivation
|
||||
allBuilds = builtins.listToAttrs (lists.map toBuildAttrs magmaReleases);
|
||||
|
||||
buildInputs = [
|
||||
libpthreadstubs
|
||||
lapack
|
||||
blas
|
||||
] ++ lib.optionals useCUDA [
|
||||
cudatoolkit
|
||||
] ++ lib.optionals useROCM [
|
||||
hip
|
||||
hipblas
|
||||
hipsparse
|
||||
openmp
|
||||
];
|
||||
# The latest release will be our default build
|
||||
# defaultBuild :: AttrSet String Derivation
|
||||
defaultBuild.magma = allBuilds.${latestReleaseName};
|
||||
|
||||
cmakeFlags = lib.optionals useCUDA [
|
||||
"-DCMAKE_C_COMPILER=${cudatoolkit.cc}/bin/gcc"
|
||||
"-DCMAKE_CXX_COMPILER=${cudatoolkit.cc}/bin/g++"
|
||||
"-DMAGMA_ENABLE_CUDA=ON"
|
||||
"-DGPU_TARGET=${builtins.concatStringsSep "," cudaFlags.cudaRealArches}"
|
||||
] ++ lib.optionals useROCM [
|
||||
"-DCMAKE_C_COMPILER=${hip}/bin/hipcc"
|
||||
"-DCMAKE_CXX_COMPILER=${hip}/bin/hipcc"
|
||||
"-DMAGMA_ENABLE_HIP=ON"
|
||||
"-DGPU_TARGET=${builtins.concatStringsSep "," (if gpuTargets == [ ] then hip.gpuTargets else gpuTargets)}"
|
||||
];
|
||||
# builds :: AttrSet String Derivation
|
||||
builds = allBuilds // defaultBuild;
|
||||
in
|
||||
|
||||
buildFlags = [
|
||||
"magma"
|
||||
"magma_sparse"
|
||||
];
|
||||
builds
|
||||
|
||||
doCheck = false;
|
||||
|
||||
passthru = {
|
||||
inherit cudatoolkit;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Matrix Algebra on GPU and Multicore Architectures";
|
||||
license = licenses.bsd3;
|
||||
homepage = "http://icl.cs.utk.edu/magma/index.html";
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ tbenst ];
|
||||
# CUDA and ROCm are mutually exclusive
|
||||
broken = useCUDA && useROCM || useCUDA && versionOlder cudatoolkit.version "9";
|
||||
};
|
||||
})
|
||||
|
||||
160
pkgs/development/libraries/science/math/magma/generic.nix
Normal file
160
pkgs/development/libraries/science/math/magma/generic.nix
Normal file
@ -0,0 +1,160 @@
|
||||
# Type aliases
|
||||
# Release = {
|
||||
# version: String
|
||||
# hash: String
|
||||
# supportedGpuTargets: List String
|
||||
# }
|
||||
|
||||
{ blas
|
||||
, cmake
|
||||
, cudaPackages
|
||||
, cudaSupport ? true
|
||||
, fetchurl
|
||||
, gfortran
|
||||
, gpuTargets ? [ ]
|
||||
, hip
|
||||
, hipblas
|
||||
, hipsparse
|
||||
, lapack
|
||||
, lib
|
||||
, libpthreadstubs
|
||||
, magmaRelease
|
||||
, ninja
|
||||
, openmp
|
||||
, rocmSupport ? false
|
||||
, stdenv
|
||||
, symlinkJoin
|
||||
}:
|
||||
|
||||
|
||||
let
|
||||
inherit (lib) lists strings trivial;
|
||||
inherit (cudaPackages) cudatoolkit cudaFlags cudaVersion;
|
||||
inherit (magmaRelease) version hash supportedGpuTargets;
|
||||
|
||||
# NOTE: The lists.subtractLists function is perhaps a bit unintuitive. It subtracts the elements
|
||||
# of the first list *from* the second list. That means:
|
||||
# lists.subtractLists a b = b - a
|
||||
|
||||
# For CUDA
|
||||
supportedCudaSmArches = lists.intersectLists cudaFlags.cudaRealArches supportedGpuTargets;
|
||||
# Subtract the supported SM architectures from the real SM architectures to get the unsupported
|
||||
# SM architectures.
|
||||
unsupportedCudaSmArches = lists.subtractLists supportedCudaSmArches cudaFlags.cudaRealArches;
|
||||
|
||||
# For ROCm
|
||||
# NOTE: The hip.gpuTargets are prefixed with "gfx" instead of "sm" like cudaFlags.cudaRealArches.
|
||||
# For some reason, Magma's CMakeLists.txt file does not handle the "gfx" prefix, so we must
|
||||
# remove it.
|
||||
rocmArches = lists.map (x: strings.removePrefix "gfx" x) hip.gpuTargets;
|
||||
supportedRocmArches = lists.intersectLists rocmArches supportedGpuTargets;
|
||||
unsupportedRocmArches = lists.subtractLists supportedRocmArches rocmArches;
|
||||
|
||||
supportedCustomGpuTargets = lists.intersectLists gpuTargets supportedGpuTargets;
|
||||
unsupportedCustomGpuTargets = lists.subtractLists supportedCustomGpuTargets gpuTargets;
|
||||
|
||||
# Use trivial.warnIf to print a warning if any unsupported GPU targets are specified.
|
||||
gpuArchWarner = supported: unsupported:
|
||||
trivial.throwIf (supported == [ ])
|
||||
(
|
||||
"No supported GPU targets specified. Requested GPU targets: "
|
||||
+ strings.concatStringsSep ", " unsupported
|
||||
)
|
||||
supported;
|
||||
|
||||
# Create the gpuTargetString.
|
||||
gpuTargetString = strings.concatStringsSep "," (
|
||||
if gpuTargets != [ ] then
|
||||
# If gpuTargets is specified, it always takes priority.
|
||||
gpuArchWarner supportedCustomGpuTargets unsupportedCustomGpuTargets
|
||||
else if cudaSupport then
|
||||
gpuArchWarner supportedCudaSmArches unsupportedCudaSmArches
|
||||
else if rocmSupport then
|
||||
gpuArchWarner supportedRocmArches unsupportedRocmArches
|
||||
else
|
||||
throw "No GPU targets specified"
|
||||
);
|
||||
|
||||
cuda_joined = symlinkJoin {
|
||||
name = "cuda-redist-${cudaVersion}";
|
||||
paths = with cudaPackages; [
|
||||
cuda_nvcc
|
||||
cuda_cudart # cuda_runtime.h
|
||||
libcublas
|
||||
libcusparse
|
||||
cuda_nvprof # <cuda_profiler_api.h>
|
||||
];
|
||||
};
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "magma";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
name = "magma-${version}.tar.gz";
|
||||
url = "https://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-${version}.tar.gz";
|
||||
inherit hash;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
ninja
|
||||
gfortran
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
libpthreadstubs
|
||||
lapack
|
||||
blas
|
||||
] ++ lists.optionals cudaSupport [
|
||||
cuda_joined
|
||||
] ++ lists.optionals rocmSupport [
|
||||
hip
|
||||
hipblas
|
||||
hipsparse
|
||||
openmp
|
||||
];
|
||||
|
||||
cmakeFlags = lists.optionals cudaSupport [
|
||||
"-DCMAKE_C_COMPILER=${cudatoolkit.cc}/bin/cc"
|
||||
"-DCMAKE_CXX_COMPILER=${cudatoolkit.cc}/bin/c++"
|
||||
"-DMAGMA_ENABLE_CUDA=ON"
|
||||
] ++ lists.optionals rocmSupport [
|
||||
"-DCMAKE_C_COMPILER=${hip}/bin/hipcc"
|
||||
"-DCMAKE_CXX_COMPILER=${hip}/bin/hipcc"
|
||||
"-DMAGMA_ENABLE_HIP=ON"
|
||||
];
|
||||
|
||||
# NOTE: We must set GPU_TARGET in preConfigure in this way because it may contain spaces.
|
||||
preConfigure = ''
|
||||
cmakeFlagsArray+=("-DGPU_TARGET=${gpuTargetString}")
|
||||
''
|
||||
# NOTE: The stdenv's CXX is used when compiling the CMake test to determine the version of
|
||||
# CUDA available. This isn't necessarily the same as cudatoolkit.cc, so we must set
|
||||
# CUDAHOSTCXX.
|
||||
+ strings.optionalString cudaSupport ''
|
||||
export CUDAHOSTCXX=${cudatoolkit.cc}/bin/c++
|
||||
'';
|
||||
|
||||
buildFlags = [
|
||||
"magma"
|
||||
"magma_sparse"
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
|
||||
passthru = {
|
||||
inherit cudaPackages cudaSupport;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Matrix Algebra on GPU and Multicore Architectures";
|
||||
license = licenses.bsd3;
|
||||
homepage = "http://icl.cs.utk.edu/magma/index.html";
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ tbenst ];
|
||||
# CUDA and ROCm are mutually exclusive
|
||||
broken = cudaSupport && rocmSupport || cudaSupport && strings.versionOlder cudaVersion "9";
|
||||
};
|
||||
}
|
||||
98
pkgs/development/libraries/science/math/magma/releases.nix
Normal file
98
pkgs/development/libraries/science/math/magma/releases.nix
Normal file
@ -0,0 +1,98 @@
|
||||
# NOTE: Order matters! Put the oldest version first, and the newest version last.
|
||||
# NOTE: Make sure the supportedGpuTargets are in order of oldest to newest.
|
||||
# You can update the supportedGpuTargets by looking at the CMakeLists.txt file.
|
||||
# CUDA starts here: https://bitbucket.org/icl/magma/src/f4ec79e2c13a2347eff8a77a3be6f83bc2daec20/CMakeLists.txt#lines-175
|
||||
# HIP is here: https://bitbucket.org/icl/magma/src/f4ec79e2c13a2347eff8a77a3be6f83bc2daec20/CMakeLists.txt#lines-386
|
||||
[
|
||||
{
|
||||
version = "2.6.2";
|
||||
hash = "sha256-dbVU2rAJA+LRC5cskT5Q5/iMvGLzrkMrWghsfk7aCnE=";
|
||||
supportedGpuTargets = [
|
||||
"sm_20"
|
||||
"sm_30"
|
||||
"sm_35"
|
||||
"sm_37"
|
||||
"sm_50"
|
||||
"sm_52"
|
||||
"sm_53"
|
||||
"sm_60"
|
||||
"sm_61"
|
||||
"sm_62"
|
||||
"sm_70"
|
||||
"sm_71"
|
||||
"sm_75"
|
||||
"sm_80"
|
||||
"700"
|
||||
"701"
|
||||
"702"
|
||||
"703"
|
||||
"704"
|
||||
"705"
|
||||
"801"
|
||||
"802"
|
||||
"803"
|
||||
"805"
|
||||
"810"
|
||||
"900"
|
||||
"902"
|
||||
"904"
|
||||
"906"
|
||||
"908"
|
||||
"909"
|
||||
"90c"
|
||||
"1010"
|
||||
"1011"
|
||||
"1012"
|
||||
"1030"
|
||||
"1031"
|
||||
"1032"
|
||||
"1033"
|
||||
];
|
||||
}
|
||||
{
|
||||
version = "2.7.1";
|
||||
hash = "sha256-2chxHAR6OMrhbv3nS+4uszMyF/0nEeHpuGBsu7SuGlA=";
|
||||
supportedGpuTargets = [
|
||||
"sm_20"
|
||||
"sm_30"
|
||||
"sm_35"
|
||||
"sm_37"
|
||||
"sm_50"
|
||||
"sm_52"
|
||||
"sm_53"
|
||||
"sm_60"
|
||||
"sm_61"
|
||||
"sm_62"
|
||||
"sm_70"
|
||||
"sm_71"
|
||||
"sm_75"
|
||||
"sm_80"
|
||||
"sm_90"
|
||||
"700"
|
||||
"701"
|
||||
"702"
|
||||
"703"
|
||||
"704"
|
||||
"705"
|
||||
"801"
|
||||
"802"
|
||||
"803"
|
||||
"805"
|
||||
"810"
|
||||
"900"
|
||||
"902"
|
||||
"904"
|
||||
"906"
|
||||
"908"
|
||||
"909"
|
||||
"90c"
|
||||
"1010"
|
||||
"1011"
|
||||
"1012"
|
||||
"1030"
|
||||
"1031"
|
||||
"1032"
|
||||
"1033"
|
||||
];
|
||||
}
|
||||
]
|
||||
File diff suppressed because it is too large
Load Diff
@ -2,13 +2,14 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "base64";
|
||||
version = "3.5.0";
|
||||
version = "3.5.1";
|
||||
|
||||
minimalOCamlVersion = "4.03";
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/ocaml-base64/releases/download/v${version}/base64-v${version}.tbz";
|
||||
sha256 = "sha256-WJ3pwAV46/54QZismBjTWGxHSyMWts0+HEbMsfYq46Q=";
|
||||
url = "https://github.com/mirage/ocaml-base64/releases/download/v${version}/base64-${version}.tbz";
|
||||
hash = "sha256-2P7apZvRL+rnrMCLWSjdR4qsUj9MqNJARw0lAGUcZe0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ findlib ];
|
||||
|
||||
@ -20,7 +20,7 @@ buildDunePackage rec {
|
||||
pname = "bistro";
|
||||
version = "unstable-2022-05-07";
|
||||
|
||||
useDune2 = true;
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pveber";
|
||||
|
||||
@ -15,11 +15,12 @@ buildDunePackage rec {
|
||||
pname = "emile";
|
||||
version = "1.1";
|
||||
|
||||
useDune2 = true;
|
||||
minimalOCamlVersion = "4.08";
|
||||
duneVersion = "3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/dinosaure/emile/releases/download/v${version}/emile-v${version}.tbz";
|
||||
sha256 = "0r1141makr0b900aby1gn0fccjv1qcqgyxib3bzq8fxmjqwjan8p";
|
||||
hash = "sha256:0r1141makr0b900aby1gn0fccjv1qcqgyxib3bzq8fxmjqwjan8p";
|
||||
};
|
||||
|
||||
buildInputs = [ cmdliner ];
|
||||
@ -32,10 +33,7 @@ buildDunePackage rec {
|
||||
uutf
|
||||
];
|
||||
|
||||
# technically emile is available for ocaml >= 4.03, but alcotest
|
||||
# and angstrom (fmt) are only available for >= 4.08. Disabling
|
||||
# tests for < 4.08 at least improves the error message
|
||||
doCheck = lib.versionAtLeast ocaml.version "4.08";
|
||||
doCheck = true;
|
||||
checkInputs = [ alcotest ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -30,6 +30,7 @@ buildDunePackage rec {
|
||||
src
|
||||
;
|
||||
|
||||
duneVersion = "3";
|
||||
minimalOCamlVersion = "4.06";
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -10,10 +10,11 @@ buildDunePackage rec {
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/index/releases/download/${version}/index-${version}.tbz";
|
||||
sha256 = "sha256-rPwNzqkWqDak2mDTDIBqIvachY1vfOIzFmwaXjZea+4=";
|
||||
hash = "sha256-rPwNzqkWqDak2mDTDIBqIvachY1vfOIzFmwaXjZea+4=";
|
||||
};
|
||||
|
||||
minimalOCamlVersion = "4.08";
|
||||
duneVersion = "3";
|
||||
|
||||
buildInputs = [
|
||||
stdlib-shims
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user