Merge staging-next into staging
This commit is contained in:
github-actions[bot]
GitHub
commit
f19f490d4e
|
|
@ -436,10 +436,7 @@ rec {
|
|||
|
||||
# Deprecated; should not be used because it quietly concatenates
|
||||
# strings, which is usually not what you want.
|
||||
string = separatedString "" // {
|
||||
name = "string";
|
||||
deprecationMessage = "See https://github.com/NixOS/nixpkgs/pull/66346 for better alternative types.";
|
||||
};
|
||||
string = throw "The type `types.string` is deprecated. See https://github.com/NixOS/nixpkgs/pull/66346 for better alternative types.";
|
||||
|
||||
passwdEntry = entryType: addCheck entryType (str: !(hasInfix ":" str || hasInfix "\n" str)) // {
|
||||
name = "passwdEntry ${entryType.name}";
|
||||
|
|
|
|||
|
|
@ -12730,6 +12730,11 @@
|
|||
githubId = 357005;
|
||||
name = "Marco Orovecchia";
|
||||
};
|
||||
orthros = {
|
||||
github = "orthros";
|
||||
githubId = 7820716;
|
||||
name = "orthros";
|
||||
};
|
||||
osener = {
|
||||
email = "ozan@ozansener.com";
|
||||
github = "osener";
|
||||
|
|
|
|||
|
|
@ -120,5 +120,8 @@ with lib;
|
|||
[PStore]
|
||||
Unlink=no
|
||||
'';
|
||||
|
||||
# allow nix-copy to live system
|
||||
nix.settings.trusted-users = [ "root" "nixos" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -71,9 +71,9 @@ let
|
|||
if ! keyValid; then
|
||||
echo "certificate soon to become invalid; backing up old cert"
|
||||
mkdir -p oldkeys
|
||||
mv -v ${cfg.providerName}.key oldkeys/${cfg.providerName}-$(date +%F-%T).key
|
||||
mv -v ${cfg.providerName}.crt oldkeys/${cfg.providerName}-$(date +%F-%T).crt
|
||||
systemctl restart dnscrypt-wrapper
|
||||
mv -v "${cfg.providerName}.key" "oldkeys/${cfg.providerName}-$(date +%F-%T).key"
|
||||
mv -v "${cfg.providerName}.crt" "oldkeys/${cfg.providerName}-$(date +%F-%T).crt"
|
||||
kill "$(pidof -s dnscrypt-wrapper)"
|
||||
fi
|
||||
'';
|
||||
|
||||
|
|
@ -222,17 +222,6 @@ in {
|
|||
};
|
||||
users.groups.dnscrypt-wrapper = { };
|
||||
|
||||
security.polkit.extraConfig = ''
|
||||
// Allow dnscrypt-wrapper user to restart dnscrypt-wrapper.service
|
||||
polkit.addRule(function(action, subject) {
|
||||
if (action.id == "org.freedesktop.systemd1.manage-units" &&
|
||||
action.lookup("unit") == "dnscrypt-wrapper.service" &&
|
||||
subject.user == "dnscrypt-wrapper") {
|
||||
return polkit.Result.YES;
|
||||
}
|
||||
});
|
||||
'';
|
||||
|
||||
systemd.services.dnscrypt-wrapper = {
|
||||
description = "dnscrypt-wrapper daemon";
|
||||
after = [ "network.target" ];
|
||||
|
|
@ -242,7 +231,7 @@ in {
|
|||
serviceConfig = {
|
||||
User = "dnscrypt-wrapper";
|
||||
WorkingDirectory = dataDir;
|
||||
Restart = "on-failure";
|
||||
Restart = "always";
|
||||
ExecStart = "${pkgs.dnscrypt-wrapper}/bin/dnscrypt-wrapper ${toString daemonArgs}";
|
||||
};
|
||||
|
||||
|
|
@ -255,7 +244,7 @@ in {
|
|||
requires = [ "dnscrypt-wrapper.service" ];
|
||||
description = "Rotates DNSCrypt wrapper keys if soon to expire";
|
||||
|
||||
path = with pkgs; [ dnscrypt-wrapper dnscrypt-proxy1 gawk ];
|
||||
path = with pkgs; [ dnscrypt-wrapper dnscrypt-proxy1 gawk procps ];
|
||||
script = rotateKeys;
|
||||
serviceConfig.User = "dnscrypt-wrapper";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -217,7 +217,7 @@ in {
|
|||
disable-installer-tools = handleTest ./disable-installer-tools.nix {};
|
||||
discourse = handleTest ./discourse.nix {};
|
||||
dnscrypt-proxy2 = handleTestOn ["x86_64-linux"] ./dnscrypt-proxy2.nix {};
|
||||
dnscrypt-wrapper = handleTestOn ["x86_64-linux"] ./dnscrypt-wrapper {};
|
||||
dnscrypt-wrapper = runTestOn ["x86_64-linux"] ./dnscrypt-wrapper;
|
||||
dnsdist = handleTest ./dnsdist.nix {};
|
||||
doas = handleTest ./doas.nix {};
|
||||
docker = handleTestOn ["aarch64-linux" "x86_64-linux"] ./docker.nix {};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
import ../make-test-python.nix ({ pkgs, ... }: {
|
||||
{ lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
name = "dnscrypt-wrapper";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ rnhmjoj ];
|
||||
|
|
@ -50,23 +52,23 @@ import ../make-test-python.nix ({ pkgs, ... }: {
|
|||
server.wait_for_unit("dnscrypt-wrapper")
|
||||
server.wait_for_file("/var/lib/dnscrypt-wrapper/2.dnscrypt-cert.server.key")
|
||||
server.wait_for_file("/var/lib/dnscrypt-wrapper/2.dnscrypt-cert.server.crt")
|
||||
almost_expiration = server.succeed("date --date '4days 23 hours 56min'").strip()
|
||||
|
||||
with subtest("The client can connect to the server"):
|
||||
server.wait_for_unit("tinydns")
|
||||
client.wait_for_unit("dnscrypt-proxy2")
|
||||
assert "1.2.3.4" in client.succeed(
|
||||
assert "1.2.3.4" in client.wait_until_succeeds(
|
||||
"host it.works"
|
||||
), "The IP address of 'it.works' does not match 1.2.3.4"
|
||||
|
||||
with subtest("The server rotates the ephemeral keys"):
|
||||
# advance time by a little less than 5 days
|
||||
server.succeed("date -s \"$(date --date '4 days 6 hours')\"")
|
||||
client.succeed("date -s \"$(date --date '4 days 6 hours')\"")
|
||||
server.succeed(f"date -s '{almost_expiration}'")
|
||||
client.succeed(f"date -s '{almost_expiration}'")
|
||||
server.wait_for_file("/var/lib/dnscrypt-wrapper/oldkeys")
|
||||
|
||||
with subtest("The client can still connect to the server"):
|
||||
server.wait_for_unit("dnscrypt-wrapper")
|
||||
client.succeed("host it.works")
|
||||
'';
|
||||
})
|
||||
|
||||
}
|
||||
|
|
|
|||
35
pkgs/applications/blockchains/optimism/default.nix
Normal file
35
pkgs/applications/blockchains/optimism/default.nix
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, libpcap
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "optimism";
|
||||
version = "1.1.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ethereum-optimism";
|
||||
repo = "optimism";
|
||||
rev = "op-node/v${version}";
|
||||
hash = "sha256-COTpmjDH1u2dJA0nKPBG1Aocpyyo8NdtowwjHDTbEKI=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
subPackages = [ "op-node/cmd" "op-proposer/cmd" "op-batcher/cmd" ];
|
||||
|
||||
vendorHash = "sha256-yAUeCX05dCVEvIzp0cXB/qYVtu3gQfgFi1CNZZKllOU=";
|
||||
|
||||
buildInputs = [
|
||||
libpcap
|
||||
];
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Optimism is Ethereum, scaled";
|
||||
homepage = "https://github.com/ethereum-optimism/optimism";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
};
|
||||
}
|
||||
50
pkgs/applications/blockchains/optimism/geth.nix
Normal file
50
pkgs/applications/blockchains/optimism/geth.nix
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, libobjc
|
||||
, IOKit
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "op-geth";
|
||||
version = "1.101106.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "ethereum-optimism";
|
||||
repo = "op-geth";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-hLng9DMzRN43m0+GAc6Bn0c9heuekghn4ZdDKgQcSKY=";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
subPackages = [
|
||||
"cmd/abidump"
|
||||
"cmd/abigen"
|
||||
"cmd/bootnode"
|
||||
"cmd/clef"
|
||||
"cmd/devp2p"
|
||||
"cmd/ethkey"
|
||||
"cmd/evm"
|
||||
"cmd/faucet"
|
||||
"cmd/geth"
|
||||
"cmd/p2psim"
|
||||
"cmd/rlpdump"
|
||||
"cmd/utils"
|
||||
];
|
||||
|
||||
vendorHash = "sha256-bGEvBXG6q9m5go+4mAlOu424ReTbfwVhkohN+FikBMg=";
|
||||
|
||||
# Fix for usb-related segmentation faults on darwin
|
||||
propagatedBuildInputs =
|
||||
lib.optionals stdenv.isDarwin [ libobjc IOKit ];
|
||||
|
||||
ldflags = [ "-s" "-w" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "";
|
||||
homepage = "https://github.com/ethereum-optimism/op-geth";
|
||||
license = licenses.gpl3Only;
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
};
|
||||
}
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -265,10 +265,10 @@
|
|||
elpaBuild {
|
||||
pname = "auctex";
|
||||
ename = "auctex";
|
||||
version = "13.2.0";
|
||||
version = "13.2.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/auctex-13.2.0.tar";
|
||||
sha256 = "1jk05cca7lrwykj3by4s7c198bffam0mga7hgwmcz5bgxl79ijvf";
|
||||
url = "https://elpa.gnu.org/packages/auctex-13.2.1.tar";
|
||||
sha256 = "0q914q1qm5w0yx9cqfmyxzbzxmrdkz321cazy7g7l4mc5qndb9nm";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -565,6 +565,21 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
buildbot = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "buildbot";
|
||||
ename = "buildbot";
|
||||
version = "0.0.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/buildbot-0.0.1.tar";
|
||||
sha256 = "0glvybvjgwbx3dnr09w9y65v2ic080a4zhs88893amvfw29ig4lx";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/buildbot.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
calibre = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "calibre";
|
||||
|
|
@ -584,10 +599,10 @@
|
|||
elpaBuild {
|
||||
pname = "cape";
|
||||
ename = "cape";
|
||||
version = "0.15";
|
||||
version = "0.16";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/cape-0.15.tar";
|
||||
sha256 = "1gy99a7zg8kbh7f4fqqq7cpwjmq7af066m6z6c1wrv438sfsd3kz";
|
||||
url = "https://elpa.gnu.org/packages/cape-0.16.tar";
|
||||
sha256 = "1l9zw71dl5g3q9iysd64l27id63w3klqy9dzc1fn1q6y5gsf8bl4";
|
||||
};
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
|
|
@ -832,10 +847,10 @@
|
|||
elpaBuild {
|
||||
pname = "compat";
|
||||
ename = "compat";
|
||||
version = "29.1.4.1";
|
||||
version = "29.1.4.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/compat-29.1.4.1.tar";
|
||||
sha256 = "1r8laxmdyrpz4nmzjrndd668bks4fgmbya04m0bfzwvhlrsca940";
|
||||
url = "https://elpa.gnu.org/packages/compat-29.1.4.2.tar";
|
||||
sha256 = "1njvbvvx2gl10psswb8md2s9diiy476gy4yj6vwips40r0n96l3g";
|
||||
};
|
||||
packageRequires = [ emacs seq ];
|
||||
meta = {
|
||||
|
|
@ -847,10 +862,10 @@
|
|||
elpaBuild {
|
||||
pname = "consult";
|
||||
ename = "consult";
|
||||
version = "0.34";
|
||||
version = "0.35";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/consult-0.34.tar";
|
||||
sha256 = "12dljbs0x5gbayibzb0mb3bn78wlfx9078b8l0fyfpvbhd9lxhfl";
|
||||
url = "https://elpa.gnu.org/packages/consult-0.35.tar";
|
||||
sha256 = "00rw4d9k16wx55pk7fyj4z718vmqjq18jy0xiv7izzkdkkkk3l7p";
|
||||
};
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
|
|
@ -892,10 +907,10 @@
|
|||
elpaBuild {
|
||||
pname = "corfu";
|
||||
ename = "corfu";
|
||||
version = "0.36";
|
||||
version = "0.37";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/corfu-0.36.tar";
|
||||
sha256 = "15ysg54rallbdx6la8q8yjdj9rag91wkga8agrwf0xh7pp3nij9d";
|
||||
url = "https://elpa.gnu.org/packages/corfu-0.37.tar";
|
||||
sha256 = "0r5c8960nxfdn0kc0x7v0sla0mqids54s5xw9rj6818w1vk9r7g7";
|
||||
};
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
|
|
@ -1027,10 +1042,10 @@
|
|||
elpaBuild {
|
||||
pname = "cursory";
|
||||
ename = "cursory";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/cursory-1.0.0.tar";
|
||||
sha256 = "08mh6564xr4dni53dm7m4jz8cf8v6i99xnrxyp76zvaa809zc5q3";
|
||||
url = "https://elpa.gnu.org/packages/cursory-1.0.1.tar";
|
||||
sha256 = "0m6q7x5144l2q582gdaqgirvgy30ljd1qyjf82l3v1jkc5qf9wfr";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -1102,10 +1117,10 @@
|
|||
elpaBuild {
|
||||
pname = "debbugs";
|
||||
ename = "debbugs";
|
||||
version = "0.35";
|
||||
version = "0.36";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/debbugs-0.35.tar";
|
||||
sha256 = "1w6y02ikjshfk12sdgbryfgj2z4yia2mpifa7g13ab7v9phpqpl1";
|
||||
url = "https://elpa.gnu.org/packages/debbugs-0.36.tar";
|
||||
sha256 = "1rzv13shadbvy583vjj4zg13v920zpiqrsnn10r3cqqyli89ivn2";
|
||||
};
|
||||
packageRequires = [ emacs soap-client ];
|
||||
meta = {
|
||||
|
|
@ -1132,10 +1147,10 @@
|
|||
elpaBuild {
|
||||
pname = "denote";
|
||||
ename = "denote";
|
||||
version = "1.2.0";
|
||||
version = "2.0.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/denote-1.2.0.tar";
|
||||
sha256 = "09xbyh22xll82ywqmlbsvqhxlqawfivaqydha0gs5qc4yn71kp0k";
|
||||
url = "https://elpa.gnu.org/packages/denote-2.0.0.tar";
|
||||
sha256 = "1wrfbirkzf9szss1rgpmgdr0gy2dvhnbzlnyhw3sp2jvw5sb1xz9";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -1278,6 +1293,21 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
dired-preview = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "dired-preview";
|
||||
ename = "dired-preview";
|
||||
version = "0.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/dired-preview-0.1.1.tar";
|
||||
sha256 = "1qmrh0sd9s908xkxz5vfhq956ynrx6k2bx8lddmdp8ci8xkw6wmh";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/dired-preview.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
disk-usage = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "disk-usage";
|
||||
|
|
@ -1477,10 +1507,10 @@
|
|||
elpaBuild {
|
||||
pname = "ef-themes";
|
||||
ename = "ef-themes";
|
||||
version = "1.1.1";
|
||||
version = "1.2.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ef-themes-1.1.1.tar";
|
||||
sha256 = "0yd3m9az0kdv73wx2vbvv0zmlknnc929ldyxnf78w81r5hd4vn7c";
|
||||
url = "https://elpa.gnu.org/packages/ef-themes-1.2.0.tar";
|
||||
sha256 = "1s4kw4y8k66x76j6c03gr2my2s95ymdjxwh01lzhyy5xkggikqfj";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -1602,6 +1632,21 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
emacs-gc-stats = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "emacs-gc-stats";
|
||||
ename = "emacs-gc-stats";
|
||||
version = "1.4.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/emacs-gc-stats-1.4.1.tar";
|
||||
sha256 = "0k7vng4ikcgb3s9qwjxfyjaq4s45n9r2m9hhnvi953gh3q4xdyck";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/emacs-gc-stats.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
embark = callPackage ({ compat, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "embark";
|
||||
|
|
@ -1651,10 +1696,10 @@
|
|||
elpaBuild {
|
||||
pname = "ement";
|
||||
ename = "ement";
|
||||
version = "0.9.3";
|
||||
version = "0.10";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ement-0.9.3.tar";
|
||||
sha256 = "0pqxq2pqj5hjd2fg403y05x99i6x666vk2z2jbm3ipxwnp4krppw";
|
||||
url = "https://elpa.gnu.org/packages/ement-0.10.tar";
|
||||
sha256 = "0iw4vk99h15zhq507praqqar9sc5yyk5hbckygbr4x6af88jc02i";
|
||||
};
|
||||
packageRequires = [
|
||||
emacs
|
||||
|
|
@ -1680,10 +1725,10 @@
|
|||
elpaBuild {
|
||||
pname = "emms";
|
||||
ename = "emms";
|
||||
version = "15";
|
||||
version = "16";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/emms-15.tar";
|
||||
sha256 = "0kd9qx93cgcxyqsnbp95xx414s08rd5bb35aif3c7qyab5w05yi6";
|
||||
url = "https://elpa.gnu.org/packages/emms-16.tar";
|
||||
sha256 = "1c18lrrfg1n5vn1av9p7q3jys27pdmxq8pq5gqb6397jnv9xywby";
|
||||
};
|
||||
packageRequires = [ cl-lib nadvice seq ];
|
||||
meta = {
|
||||
|
|
@ -2664,10 +2709,10 @@
|
|||
elpaBuild {
|
||||
pname = "jinx";
|
||||
ename = "jinx";
|
||||
version = "0.8";
|
||||
version = "0.9";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/jinx-0.8.tar";
|
||||
sha256 = "19dgp312jvpy3k0xq0r033jfhnyrl8xfv3q2djwv9s7883483srn";
|
||||
url = "https://elpa.gnu.org/packages/jinx-0.9.tar";
|
||||
sha256 = "0q9g3agql5gm95r64lpcwcs9scwhmwcjjnkiykzxdzpnkjn0mjgb";
|
||||
};
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
|
|
@ -2969,10 +3014,10 @@
|
|||
elpaBuild {
|
||||
pname = "logos";
|
||||
ename = "logos";
|
||||
version = "1.0.1";
|
||||
version = "1.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/logos-1.0.1.tar";
|
||||
sha256 = "1kmfsgapinx6p8zyxd2s81j703iiril9c907r576z5k498pfifb6";
|
||||
url = "https://elpa.gnu.org/packages/logos-1.1.1.tar";
|
||||
sha256 = "1lg4disxfzw9nf438j32q1cna447mlxy3sg523cqzhimh1mk5s9f";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -3029,10 +3074,10 @@
|
|||
elpaBuild {
|
||||
pname = "marginalia";
|
||||
ename = "marginalia";
|
||||
version = "1.2";
|
||||
version = "1.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/marginalia-1.2.tar";
|
||||
sha256 = "1hhq09ghc8pcphgjhp5mc81i7j4xkkf5sc0swd6xr6mrxd044fnj";
|
||||
url = "https://elpa.gnu.org/packages/marginalia-1.3.tar";
|
||||
sha256 = "14wk3ld9zaj05dmsyhq70kdl0h4bk4gl6sn7x5cckq3av78idh39";
|
||||
};
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
|
|
@ -3349,10 +3394,10 @@
|
|||
elpaBuild {
|
||||
pname = "nano-modeline";
|
||||
ename = "nano-modeline";
|
||||
version = "1.0.0";
|
||||
version = "1.0.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/nano-modeline-1.0.0.tar";
|
||||
sha256 = "0fg4s3ydmb769mnyx3ngx7rp5g8pmm91rqwng05jb8sgn0sfmsni";
|
||||
url = "https://elpa.gnu.org/packages/nano-modeline-1.0.1.tar";
|
||||
sha256 = "1bjxsqbi540cx2zxzrps2bdwj3hkaxw1s9wha1lrldhvckq7dm91";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -3443,10 +3488,10 @@
|
|||
elpaBuild {
|
||||
pname = "notmuch-indicator";
|
||||
ename = "notmuch-indicator";
|
||||
version = "0.2.2";
|
||||
version = "1.0.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/notmuch-indicator-0.2.2.tar";
|
||||
sha256 = "1jca5zm8vd91ivk5c6n2210ybp1i8rb8cpi1dymbxkcjxc61fzgp";
|
||||
url = "https://elpa.gnu.org/packages/notmuch-indicator-1.0.1.tar";
|
||||
sha256 = "1n5k2ikk93mdwqqysf6l7gd8i6iazk8yvbqpf8xnz5zny248cc2x";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -3593,10 +3638,10 @@
|
|||
elpaBuild {
|
||||
pname = "org";
|
||||
ename = "org";
|
||||
version = "9.6.6";
|
||||
version = "9.6.7";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/org-9.6.6.tar";
|
||||
sha256 = "00xp2v0crg5ls79a9waapymr8rrv00gpff3ihm3w8mr3f6dyypn9";
|
||||
url = "https://elpa.gnu.org/packages/org-9.6.7.tar";
|
||||
sha256 = "1wj9sj9ybfkwsk6chxs4pk7fxmnw3r6ai9xj9rr0wrvk0771350c";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -3638,10 +3683,10 @@
|
|||
elpaBuild {
|
||||
pname = "org-modern";
|
||||
ename = "org-modern";
|
||||
version = "0.9";
|
||||
version = "0.10";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/org-modern-0.9.tar";
|
||||
sha256 = "1aq02w1mbqfx370d18a21w6jhnwad55v73yhlvqyghkh1xdi3h0j";
|
||||
url = "https://elpa.gnu.org/packages/org-modern-0.10.tar";
|
||||
sha256 = "0y17n6ac1b8rsa91qbisagp5mpmpnlni3j78x55z5dnpbi31yn1l";
|
||||
};
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
|
|
@ -3758,10 +3803,10 @@
|
|||
elpaBuild {
|
||||
pname = "osm";
|
||||
ename = "osm";
|
||||
version = "0.12";
|
||||
version = "0.13";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/osm-0.12.tar";
|
||||
sha256 = "1i94ymji0kknrf8p49vghs7s9f16skp5vsxayj1dy52gkvfh273j";
|
||||
url = "https://elpa.gnu.org/packages/osm-0.13.tar";
|
||||
sha256 = "13bdp8cz1w396vdfxvv8ygla7cbln178rjliknhfl3kqggg32kqx";
|
||||
};
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
|
|
@ -3878,10 +3923,10 @@
|
|||
elpaBuild {
|
||||
pname = "perl-doc";
|
||||
ename = "perl-doc";
|
||||
version = "0.6";
|
||||
version = "0.81";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/perl-doc-0.6.tar";
|
||||
sha256 = "0xmk09pfvdzkrjfsa2l78bd6akcbdhcbnpvwnm6r83h65gpld79f";
|
||||
url = "https://elpa.gnu.org/packages/perl-doc-0.81.tar";
|
||||
sha256 = "1hbf36zrpjx0xx257370axxfs1yb3iz6g9kc4wg83gcag09j3lci";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -3938,10 +3983,10 @@
|
|||
elpaBuild {
|
||||
pname = "plz";
|
||||
ename = "plz";
|
||||
version = "0.5.4";
|
||||
version = "0.7";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/plz-0.5.4.tar";
|
||||
sha256 = "0dmjza49135x3baczk6q0lv9ib8lvfkdbbw4ps5hkr45wfxr64vc";
|
||||
url = "https://elpa.gnu.org/packages/plz-0.7.tar";
|
||||
sha256 = "00xm6hp51m4cmlw15qgqrspwgs3d9z1hw9pbpva9sa4v7vsbipd2";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -4403,10 +4448,10 @@
|
|||
elpaBuild {
|
||||
pname = "relint";
|
||||
ename = "relint";
|
||||
version = "1.22";
|
||||
version = "1.23";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/relint-1.22.tar";
|
||||
sha256 = "1525hk961q4af06c5a60m7ryp5g8yvfxjp5nmmgkci7vl3ing8zi";
|
||||
url = "https://elpa.gnu.org/packages/relint-1.23.tar";
|
||||
sha256 = "0cyv9hjlyxy1c2394544ljq5d4prhi296y9j2zy6p1lq6irncmv9";
|
||||
};
|
||||
packageRequires = [ emacs xr ];
|
||||
meta = {
|
||||
|
|
@ -4559,10 +4604,10 @@
|
|||
elpaBuild {
|
||||
pname = "sed-mode";
|
||||
ename = "sed-mode";
|
||||
version = "1.0";
|
||||
version = "1.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/sed-mode-1.0.el";
|
||||
sha256 = "1zpdai5k9zhy5hw0a5zx7qv3rcf8cn29hncfjnhk9k6sjq0302lg";
|
||||
url = "https://elpa.gnu.org/packages/sed-mode-1.1.tar";
|
||||
sha256 = "1vpfzr95xfvjiq7x1pkhjm96936yzsy9bzm1v8p3hyr486bar0mp";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
|
|
@ -4923,10 +4968,10 @@
|
|||
elpaBuild {
|
||||
pname = "ssh-deploy";
|
||||
ename = "ssh-deploy";
|
||||
version = "3.1.14";
|
||||
version = "3.1.16";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/ssh-deploy-3.1.14.tar";
|
||||
sha256 = "079g5g3640hyqdikszkz8kmfqdnqdbkl8rwd6k3kkck39ng63zy6";
|
||||
url = "https://elpa.gnu.org/packages/ssh-deploy-3.1.16.tar";
|
||||
sha256 = "0ajmsg4r9yba2m9wn08dsdzl8pr3pjixyqqp263mpwsh02h8im2g";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -4968,10 +5013,10 @@
|
|||
elpaBuild {
|
||||
pname = "substitute";
|
||||
ename = "substitute";
|
||||
version = "0.1.8";
|
||||
version = "0.2.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/substitute-0.1.8.tar";
|
||||
sha256 = "1xa1ny4iblifrylxkj2i99vnayrxh669dlbpcbk4rb7alvv1npnz";
|
||||
url = "https://elpa.gnu.org/packages/substitute-0.2.1.tar";
|
||||
sha256 = "1p9lhgi4y224aghwnnjxm14da461pj0ym4a7asla02hf33y61i5j";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -5013,10 +5058,10 @@
|
|||
elpaBuild {
|
||||
pname = "svg-lib";
|
||||
ename = "svg-lib";
|
||||
version = "0.2.6";
|
||||
version = "0.2.7";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/svg-lib-0.2.6.tar";
|
||||
sha256 = "121wnk9g1dbpkx2w7di5f5czvv17wf67sacqpfpn53185z6mwwf3";
|
||||
url = "https://elpa.gnu.org/packages/svg-lib-0.2.7.tar";
|
||||
sha256 = "0vq7a1hh6am5a1hqc1fay4cra7944zch5m5vadwhsnqgnrylm2gw";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -5088,10 +5133,10 @@
|
|||
elpaBuild {
|
||||
pname = "system-packages";
|
||||
ename = "system-packages";
|
||||
version = "1.0.11";
|
||||
version = "1.0.12";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/system-packages-1.0.11.tar";
|
||||
sha256 = "0xf2q5bslxpw0wycgi2k983lnfpw182rgdzq0f99f64kb7ifns9y";
|
||||
url = "https://elpa.gnu.org/packages/system-packages-1.0.12.tar";
|
||||
sha256 = "1q962z0lbdz7qw60lbhzqs8cqc66rhvsyjghy6rs7iqmq6h2sf8c";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -5168,10 +5213,10 @@
|
|||
elpaBuild {
|
||||
pname = "tempel";
|
||||
ename = "tempel";
|
||||
version = "0.7";
|
||||
version = "0.8";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/tempel-0.7.tar";
|
||||
sha256 = "05yhsrricaxlz67w1j0s1gbzpbsw4iqryfvks25v25pm95xrr7c4";
|
||||
url = "https://elpa.gnu.org/packages/tempel-0.8.tar";
|
||||
sha256 = "1ppvkwy7c31p4ibshfralwz02xnxmssf6lgikahpimrg928zcd80";
|
||||
};
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
|
|
@ -5277,10 +5322,10 @@
|
|||
elpaBuild {
|
||||
pname = "tramp";
|
||||
ename = "tramp";
|
||||
version = "2.6.0.5";
|
||||
version = "2.6.1.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/tramp-2.6.0.5.tar";
|
||||
sha256 = "0hbrrlcyhxkmjym4wnwipi47lzqpnlxc833p0hmghc6n0s8sx7hf";
|
||||
url = "https://elpa.gnu.org/packages/tramp-2.6.1.1.tar";
|
||||
sha256 = "0bjj4r46jgrh72p5fxyv0h0r7cx6x0l3abfcyj91hmyfgifkc5cv";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -5397,10 +5442,10 @@
|
|||
elpaBuild {
|
||||
pname = "triples";
|
||||
ename = "triples";
|
||||
version = "0.3";
|
||||
version = "0.3.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/triples-0.3.tar";
|
||||
sha256 = "0qzyhsv50qpnys28vksdv404fq6jkdd1733c21lsz15g04kaj9nf";
|
||||
url = "https://elpa.gnu.org/packages/triples-0.3.4.tar";
|
||||
sha256 = "1y0qqa51iaj62yishyl3j2j9s2p1wzg6yasq417ls3x4rdccji0g";
|
||||
};
|
||||
packageRequires = [ emacs seq ];
|
||||
meta = {
|
||||
|
|
@ -5708,10 +5753,10 @@
|
|||
elpaBuild {
|
||||
pname = "vertico";
|
||||
ename = "vertico";
|
||||
version = "1.3";
|
||||
version = "1.4";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/vertico-1.3.tar";
|
||||
sha256 = "192ljdvzyyjs9i3r3zimzarwpakibdrl036pdk60qmg4kyh057ms";
|
||||
url = "https://elpa.gnu.org/packages/vertico-1.4.tar";
|
||||
sha256 = "0jv4adwi18j14yjasqndsgyxgrd1jnjhwrw90hyplfii08f6gmdq";
|
||||
};
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
|
|
@ -5907,6 +5952,21 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
window-commander = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "window-commander";
|
||||
ename = "window-commander";
|
||||
version = "3.0.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/window-commander-3.0.2.tar";
|
||||
sha256 = "1v85g89rz8r2ypw6651lrb9mvrimdwhxan7kxzhpgam2i2g7kcr7";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/window-commander.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
windower = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "windower";
|
||||
|
|
@ -6051,10 +6111,10 @@
|
|||
elpaBuild {
|
||||
pname = "xr";
|
||||
ename = "xr";
|
||||
version = "1.23";
|
||||
version = "1.24";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.gnu.org/packages/xr-1.23.tar";
|
||||
sha256 = "1nz3fhd4qx8fxib78y41jvnzn27lf7mlvpkz565d5zc9q4mr300z";
|
||||
url = "https://elpa.gnu.org/packages/xr-1.24.tar";
|
||||
sha256 = "04g7qx6qmhp98pw5iwdhspln9sg9jzjq2zp3nmq3q1yl82pzd214";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
|
|||
|
|
@ -49,10 +49,10 @@
|
|||
elpaBuild {
|
||||
pname = "annotate";
|
||||
ename = "annotate";
|
||||
version = "2.0.0";
|
||||
version = "2.0.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/annotate-2.0.0.tar";
|
||||
sha256 = "0lahs00abcwjzjqz8238bcmsb25l0r3rj6zycsw7xjkz913sin7y";
|
||||
url = "https://elpa.nongnu.org/nongnu/annotate-2.0.1.tar";
|
||||
sha256 = "1z7s75xcjnkvn7ik7cqylf5c2cih372k1rg4wwxkz3f217d9qjlf";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
|
|
@ -306,10 +306,10 @@
|
|||
elpaBuild {
|
||||
pname = "cdlatex";
|
||||
ename = "cdlatex";
|
||||
version = "4.14";
|
||||
version = "4.15";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/cdlatex-4.14.tar";
|
||||
sha256 = "114g2afnq86c6662ychd0v64aam7nhk3hacbwx1cavhg1k2l7kci";
|
||||
url = "https://elpa.nongnu.org/nongnu/cdlatex-4.15.tar";
|
||||
sha256 = "1dj525adlc6qmv4msbhhlhli5603l0sgi40qfi6cs01ggqkpw64j";
|
||||
};
|
||||
packageRequires = [];
|
||||
meta = {
|
||||
|
|
@ -353,10 +353,10 @@
|
|||
elpaBuild {
|
||||
pname = "clojure-mode";
|
||||
ename = "clojure-mode";
|
||||
version = "5.16.0";
|
||||
version = "5.16.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.16.0.tar";
|
||||
sha256 = "1m0g7sqjs6phkkf3mx2dyxr62a48rqq69lp6r5bfa6kcbr2n4g2m";
|
||||
url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.16.1.tar";
|
||||
sha256 = "16zazwq3r6n7v7696cykf7p1pl977chwc5xijirm1p2lxbqdgy7n";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -406,10 +406,10 @@
|
|||
elpaBuild {
|
||||
pname = "corfu-terminal";
|
||||
ename = "corfu-terminal";
|
||||
version = "0.5";
|
||||
version = "0.6";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/corfu-terminal-0.5.tar";
|
||||
sha256 = "1m53d4vi7cl91d8k550735r3ns4lm9vz3gvb0b7skib8jw3x5xqr";
|
||||
url = "https://elpa.nongnu.org/nongnu/corfu-terminal-0.6.tar";
|
||||
sha256 = "1ndg7ac61gi3ikzygaac8368jw0fwa0xs7kbnz1xp083095y5r0p";
|
||||
};
|
||||
packageRequires = [ corfu emacs popon ];
|
||||
meta = {
|
||||
|
|
@ -530,10 +530,10 @@
|
|||
elpaBuild {
|
||||
pname = "devil";
|
||||
ename = "devil";
|
||||
version = "0.4.0";
|
||||
version = "0.6.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/devil-0.4.0.tar";
|
||||
sha256 = "1j6qmp1dh3f2g3nxmr5lwbabrfid5kwnbcx5ddsynqkpiq5c866x";
|
||||
url = "https://elpa.nongnu.org/nongnu/devil-0.6.0.tar";
|
||||
sha256 = "01n552pvr598igmd2q6w9kgjrwgzrgrb4w59mxpsylcv6wy2v2h5";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -665,10 +665,10 @@
|
|||
elpaBuild {
|
||||
pname = "elixir-mode";
|
||||
ename = "elixir-mode";
|
||||
version = "2.4.0";
|
||||
version = "2.5.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/elixir-mode-2.4.0.tar";
|
||||
sha256 = "0h3ypyxmcpfh8kcwd08rsild4jy8s4mr3zr8va03bbh81pd3nm1m";
|
||||
url = "https://elpa.nongnu.org/nongnu/elixir-mode-2.5.0.tar";
|
||||
sha256 = "0j4rkwmzb3grs7c56m1f6h3mcxvf4cskxf2qw9jw4fc88j5135ym";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -843,10 +843,10 @@
|
|||
elpaBuild {
|
||||
pname = "evil-matchit";
|
||||
ename = "evil-matchit";
|
||||
version = "3.0.0";
|
||||
version = "3.0.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/evil-matchit-3.0.0.tar";
|
||||
sha256 = "036zf7l8pkhbyk7gz91r00v4fqi2wfdnqv95xkh7jpm2i9xcgg5p";
|
||||
url = "https://elpa.nongnu.org/nongnu/evil-matchit-3.0.2.tar";
|
||||
sha256 = "02sim8hkclkp7lzj3hybjky75lyvf452wc7hmbkx1rjb3cx9j5m5";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -858,10 +858,10 @@
|
|||
elpaBuild {
|
||||
pname = "evil-nerd-commenter";
|
||||
ename = "evil-nerd-commenter";
|
||||
version = "3.6.0";
|
||||
version = "3.6.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/evil-nerd-commenter-3.6.0.tar";
|
||||
sha256 = "0709qlxhvmapdnl8bhqvg39cm6x4659mg0jzz5b9hmis5bpj1kiq";
|
||||
url = "https://elpa.nongnu.org/nongnu/evil-nerd-commenter-3.6.1.tar";
|
||||
sha256 = "0ixyn669fk7gcnl3nhjma67zvnavikn75yzsa4sx850s5i4i1b2a";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -1029,10 +1029,10 @@
|
|||
elpaBuild {
|
||||
pname = "geiser";
|
||||
ename = "geiser";
|
||||
version = "0.28.2";
|
||||
version = "0.29";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/geiser-0.28.2.tar";
|
||||
sha256 = "1d2g673zn59ggcr2sx9dsxibaqh6b456v4wbpg3wb5ph63rzrh8m";
|
||||
url = "https://elpa.nongnu.org/nongnu/geiser-0.29.tar";
|
||||
sha256 = "0dzqqxb83krvc6w6rwyh2i012js2qg261cgppn2dwck8cw843jx8";
|
||||
};
|
||||
packageRequires = [ emacs project ];
|
||||
meta = {
|
||||
|
|
@ -1044,10 +1044,10 @@
|
|||
elpaBuild {
|
||||
pname = "geiser-chez";
|
||||
ename = "geiser-chez";
|
||||
version = "0.17";
|
||||
version = "0.18";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/geiser-chez-0.17.tar";
|
||||
sha256 = "139x7b3q5n04ig0m263jljm4bsjiiyvi3f84pcq3bgnj3dk5dlxh";
|
||||
url = "https://elpa.nongnu.org/nongnu/geiser-chez-0.18.tar";
|
||||
sha256 = "01pkcf0lpzmazah3ddd16yf2la4zd5x4mmi5lwpbsyvyfqhxhsca";
|
||||
};
|
||||
packageRequires = [ emacs geiser ];
|
||||
meta = {
|
||||
|
|
@ -1184,10 +1184,10 @@
|
|||
elpaBuild {
|
||||
pname = "geiser-stklos";
|
||||
ename = "geiser-stklos";
|
||||
version = "1.4";
|
||||
version = "1.8";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/geiser-stklos-1.4.tar";
|
||||
sha256 = "18z34x4xmn58080r2ar6wd07kap7f367my2q5ph6cdf0gs6nz4sv";
|
||||
url = "https://elpa.nongnu.org/nongnu/geiser-stklos-1.8.tar";
|
||||
sha256 = "1bz7ggq5pl08pr68nmn82sdpb2vqi7zvsjnai8zvr93dai7p3isa";
|
||||
};
|
||||
packageRequires = [ emacs geiser ];
|
||||
meta = {
|
||||
|
|
@ -1430,10 +1430,10 @@
|
|||
elpaBuild {
|
||||
pname = "helm";
|
||||
ename = "helm";
|
||||
version = "3.9.0";
|
||||
version = "3.9.1";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/helm-3.9.0.tar";
|
||||
sha256 = "00lln7g27iipa9lhd9hw3gl6s92d2di4nlfyjz0hgg32v39fnvjd";
|
||||
url = "https://elpa.nongnu.org/nongnu/helm-3.9.1.tar";
|
||||
sha256 = "0gfhqag2f2ci3l9v504s1dv8shz5ncmiw2658q1d16w63fgakafk";
|
||||
};
|
||||
packageRequires = [ helm-core popup ];
|
||||
meta = {
|
||||
|
|
@ -1445,10 +1445,10 @@
|
|||
elpaBuild {
|
||||
pname = "helm-core";
|
||||
ename = "helm-core";
|
||||
version = "3.9.0";
|
||||
version = "3.9.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/helm-core-3.9.0.tar";
|
||||
sha256 = "1fvrxj64qc4976s6af2zc428dnx2p0skxdnkjikz8rpw8kmffcb9";
|
||||
url = "https://elpa.nongnu.org/nongnu/helm-core-3.9.3.tar";
|
||||
sha256 = "07svs1hdj30vrncp0kbmkxlfmwmdvd7nb19851p1bk0a7llkbfpm";
|
||||
};
|
||||
packageRequires = [ async emacs ];
|
||||
meta = {
|
||||
|
|
@ -1697,10 +1697,10 @@
|
|||
elpaBuild {
|
||||
pname = "keycast";
|
||||
ename = "keycast";
|
||||
version = "1.3.0";
|
||||
version = "1.3.2";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/keycast-1.3.0.tar";
|
||||
sha256 = "0yv9rcpfwjms8p7wmk2lhgbn8b44nyz6g81czcr5z39w5914rh4x";
|
||||
url = "https://elpa.nongnu.org/nongnu/keycast-1.3.2.tar";
|
||||
sha256 = "0z8q1xxx02di0788kgc4xpvl43iyknkj57l9cwf6qq6hi032c9kj";
|
||||
};
|
||||
packageRequires = [ compat emacs ];
|
||||
meta = {
|
||||
|
|
@ -1869,10 +1869,10 @@
|
|||
elpaBuild {
|
||||
pname = "meow";
|
||||
ename = "meow";
|
||||
version = "1.4.2";
|
||||
version = "1.4.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/meow-1.4.2.tar";
|
||||
sha256 = "1iwysqxmaw85k7g742nx8z9vr3nnmwaidwjmx5n96cyssf64hgkv";
|
||||
url = "https://elpa.nongnu.org/nongnu/meow-1.4.3.tar";
|
||||
sha256 = "0anpmgpr969lkyzmsms9pcbdhjpfpwyf865pmgl0zd23m922d8s6";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -2026,6 +2026,21 @@
|
|||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
opam-switch-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "opam-switch-mode";
|
||||
ename = "opam-switch-mode";
|
||||
version = "1.7";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/opam-switch-mode-1.7.tar";
|
||||
sha256 = "19mg0k6ish0grhh4d9d9m634jkgbx80bgfwf4xh0q42piypyrmrj";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
homepage = "https://elpa.gnu.org/packages/opam-switch-mode.html";
|
||||
license = lib.licenses.free;
|
||||
};
|
||||
}) {};
|
||||
org-auto-tangle = callPackage ({ async, elpaBuild, emacs, fetchurl, lib }:
|
||||
elpaBuild {
|
||||
pname = "org-auto-tangle";
|
||||
|
|
@ -2287,10 +2302,10 @@
|
|||
elpaBuild {
|
||||
pname = "php-mode";
|
||||
ename = "php-mode";
|
||||
version = "1.24.3";
|
||||
version = "1.25.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/php-mode-1.24.3.tar";
|
||||
sha256 = "0k44vkkm2njmvw3vfbc2c9v2hm8qy3bnarp328aim9761x61n9gy";
|
||||
url = "https://elpa.nongnu.org/nongnu/php-mode-1.25.0.tar";
|
||||
sha256 = "05n53risvyzgyqr0r7v7bgd267dh30wq266mmfhj2q37v1gkfjiv";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -2302,10 +2317,10 @@
|
|||
elpaBuild {
|
||||
pname = "popon";
|
||||
ename = "popon";
|
||||
version = "0.12";
|
||||
version = "0.13";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/popon-0.12.tar";
|
||||
sha256 = "06vsri7dka3qbiwfkl4ml8b99alah24zq8y4n1szh587xy3c7dj0";
|
||||
url = "https://elpa.nongnu.org/nongnu/popon-0.13.tar";
|
||||
sha256 = "1ifwkiq8viic4ymph0xrpyrmr946brp2cx48yqf4jrhknafqv5qf";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -2380,10 +2395,10 @@
|
|||
elpaBuild {
|
||||
pname = "racket-mode";
|
||||
ename = "racket-mode";
|
||||
version = "1.0.20230508.134227";
|
||||
version = "1.0.20230628.162612";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20230508.134227.tar";
|
||||
sha256 = "15h9idjiggl6v1jrmkyg7p80mgpq3mwlj0x0mz3zch6xnx30d73h";
|
||||
url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20230628.162612.tar";
|
||||
sha256 = "1if790s2dr9n1jql0mjnb4jbimff3as8112c6p47w7pbcjfjasch";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -2744,10 +2759,10 @@
|
|||
elpaBuild {
|
||||
pname = "subed";
|
||||
ename = "subed";
|
||||
version = "1.2.2";
|
||||
version = "1.2.3";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/subed-1.2.2.tar";
|
||||
sha256 = "1xlh4kqa8516rvmzy67pzs0ghk9rc919nq5b2sywd5mvzi5spxnh";
|
||||
url = "https://elpa.nongnu.org/nongnu/subed-1.2.3.tar";
|
||||
sha256 = "0np4wp7pmpayz8r9p3cl7z1i7yfq8xmkn862n9d104szf4ffk0if";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -2759,10 +2774,10 @@
|
|||
elpaBuild {
|
||||
pname = "sweeprolog";
|
||||
ename = "sweeprolog";
|
||||
version = "0.19.0";
|
||||
version = "0.22.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.19.0.tar";
|
||||
sha256 = "13jq4kprxnv2wiz1hzzjcfg418d0gj2z0bm27y1myh4ak5x1jbvj";
|
||||
url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.22.0.tar";
|
||||
sha256 = "0iqihdlypq9hs2m351pzrzc43jdxzpbws5pmb035668r38qc6v32";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
@ -2774,10 +2789,10 @@
|
|||
elpaBuild {
|
||||
pname = "swift-mode";
|
||||
ename = "swift-mode";
|
||||
version = "8.6.0";
|
||||
version = "9.0.0";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/swift-mode-8.6.0.tar";
|
||||
sha256 = "0zasgv311mjc1iih9wv8vb8h53y2pjx24xsbdnn0wk8xcdk4z8j6";
|
||||
url = "https://elpa.nongnu.org/nongnu/swift-mode-9.0.0.tar";
|
||||
sha256 = "1s69mm7yhz1dhxz118ik7nxqw6gliivbwv1qvylk8nz2lhr8sf9n";
|
||||
};
|
||||
packageRequires = [ emacs seq ];
|
||||
meta = {
|
||||
|
|
@ -3213,10 +3228,10 @@
|
|||
elpaBuild {
|
||||
pname = "xah-fly-keys";
|
||||
ename = "xah-fly-keys";
|
||||
version = "23.11.20230609124049";
|
||||
version = "24.4.20230805215231";
|
||||
src = fetchurl {
|
||||
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-23.11.20230609124049.tar";
|
||||
sha256 = "0vp457cvwvwbdzglm7s3dbghhc4p3lpr7rxni75fiyqrv8smjrwa";
|
||||
url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-24.4.20230805215231.tar";
|
||||
sha256 = "19r7avllf97g3s8zsv11nb4vs4j005ailm1lav48nll9zlm58j5x";
|
||||
};
|
||||
packageRequires = [ emacs ];
|
||||
meta = {
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -8,20 +8,35 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "geeqie";
|
||||
version = "2.0.1";
|
||||
version = "2.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BestImageViewer";
|
||||
repo = "geeqie";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-0GOX77vZ4KZkvwnR1vlv52tlbR+ciwl3ycxbOIcDOqU=";
|
||||
hash = "sha256-qkM/7auZ9TMF2r8KLnitxmvlyPmIjh7q9Ugh+QKh8hw=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "exiv2-0.28.0-support-1.patch";
|
||||
url = "https://github.com/BestImageViewer/geeqie/commit/c45cca777aa3477eaf297db99f337e18d9683c61.patch";
|
||||
hash = "sha256-YiFzAj3G3Z2w7p+8zZlDBjWqUqnfSqvaxMkESfPFdzc=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "exiv2-0.28.0-support-2.patch";
|
||||
url = "https://github.com/BestImageViewer/geeqie/commit/b04f7cd0546976dc4f7ea440648ac0eedd8df3ce.patch";
|
||||
hash = "sha256-V0ZOHbAZOrhLcNN+Al1/kvxvbw0vc/R7r99CegjuBQg=";
|
||||
})
|
||||
(fetchpatch {
|
||||
name = "fix-compilation-with-lua.patch";
|
||||
url = "https://github.com/BestImageViewer/geeqie/commit/a132645ee87e612217ac955b227cad04f21a5722.patch";
|
||||
hash = "sha256-BozarBPoIKxZS3qpjuzHHAWZGIWZAwvJyqsNC8v+TMk=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
patchShebangs .
|
||||
# libtiff detection is broken and looks for liblibtiff...
|
||||
# fixed upstream, to remove for 2.1
|
||||
substituteInPlace meson.build --replace 'libtiff' 'tiff'
|
||||
'';
|
||||
|
||||
nativeBuildInputs =
|
||||
|
|
|
|||
|
|
@ -49,6 +49,13 @@ stdenv.mkDerivation rec {
|
|||
url = "https://gitlab.gnome.org/GNOME/gthumb/-/commit/da0d3f22a5c3a141211d943e7d963d14090011ec.patch";
|
||||
sha256 = "sha256-/l9US19rKxIUJjZ+oynGLr/9PKJPg9VUuA/VSuIT5AQ=";
|
||||
})
|
||||
|
||||
# Fix build with exiv2 0.28, can be removed on next update
|
||||
# https://gitlab.gnome.org/GNOME/gthumb/-/issues/282
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gthumb/-/commit/3376550ae109286de09ce5f89e05060eb80230a7.patch";
|
||||
sha256 = "sha256-zHX+kV7RaHXFqbR15RTaRcZJPU/P3uUj03tFUv0DR5o=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -19,11 +19,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "weston";
|
||||
version = "12.0.1";
|
||||
version = "12.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${version}/downloads/weston-${version}.tar.xz";
|
||||
hash = "sha256-sYWR6rJ4vBkXIPbAkVgEC3lecRivHV3cpqzZqOIDlTU=";
|
||||
hash = "sha256-62hqfPAJkqI7F/GS/KmohzE+ksNG7jXYV1GWmD1la0o=";
|
||||
};
|
||||
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
|
|
|
|||
|
|
@ -10,9 +10,12 @@ args@{
|
|||
, bazelFlags ? []
|
||||
, bazelBuildFlags ? []
|
||||
, bazelTestFlags ? []
|
||||
, bazelRunFlags ? []
|
||||
, runTargetFlags ? []
|
||||
, bazelFetchFlags ? []
|
||||
, bazelTargets
|
||||
, bazelTargets ? []
|
||||
, bazelTestTargets ? []
|
||||
, bazelRunTarget ? null
|
||||
, buildAttrs
|
||||
, fetchAttrs
|
||||
|
||||
|
|
@ -46,17 +49,23 @@ args@{
|
|||
|
||||
let
|
||||
fArgs = removeAttrs args [ "buildAttrs" "fetchAttrs" "removeRulesCC" ] // {
|
||||
name = name;
|
||||
bazelFlags = bazelFlags;
|
||||
bazelBuildFlags = bazelBuildFlags;
|
||||
bazelTestFlags = bazelTestFlags;
|
||||
bazelFetchFlags = bazelFetchFlags;
|
||||
bazelTestTargets = bazelTestTargets;
|
||||
dontAddBazelOpts = dontAddBazelOpts;
|
||||
inherit
|
||||
name
|
||||
bazelFlags
|
||||
bazelBuildFlags
|
||||
bazelTestFlags
|
||||
bazelRunFlags
|
||||
runTargetFlags
|
||||
bazelFetchFlags
|
||||
bazelTargets
|
||||
bazelTestTargets
|
||||
bazelRunTarget
|
||||
dontAddBazelOpts
|
||||
;
|
||||
};
|
||||
fBuildAttrs = fArgs // buildAttrs;
|
||||
fFetchAttrs = fArgs // removeAttrs fetchAttrs [ "sha256" ];
|
||||
bazelCmd = { cmd, additionalFlags, targets }:
|
||||
bazelCmd = { cmd, additionalFlags, targets, targetRunFlags ? [ ] }:
|
||||
lib.optionalString (targets != [ ]) ''
|
||||
# See footnote called [USER and BAZEL_USE_CPP_ONLY_TOOLCHAIN variables]
|
||||
BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 \
|
||||
|
|
@ -73,7 +82,8 @@ let
|
|||
"''${host_linkopts[@]}" \
|
||||
$bazelFlags \
|
||||
${lib.strings.concatStringsSep " " additionalFlags} \
|
||||
${lib.strings.concatStringsSep " " targets}
|
||||
${lib.strings.concatStringsSep " " targets} \
|
||||
${lib.optionalString (targetRunFlags != []) " -- " + lib.strings.concatStringsSep " " targetRunFlags}
|
||||
'';
|
||||
# we need this to chmod dangling symlinks on darwin, gnu coreutils refuses to do so:
|
||||
# chmod: cannot operate on dangling symlink '$symlink'
|
||||
|
|
@ -262,6 +272,15 @@ stdenv.mkDerivation (fBuildAttrs // {
|
|||
targets = fBuildAttrs.bazelTargets;
|
||||
}
|
||||
}
|
||||
${
|
||||
bazelCmd {
|
||||
cmd = "run";
|
||||
additionalFlags = fBuildAttrs.bazelRunFlags ++ [ "--jobs" "$NIX_BUILD_CORES" ];
|
||||
# Bazel run only accepts a single target, but `bazelCmd` expects `targets` to be a list.
|
||||
targets = lib.optionals (fBuildAttrs.bazelRunTarget != null) [ fBuildAttrs.bazelRunTarget ];
|
||||
targetRunFlags = fBuildAttrs.runTargetFlags;
|
||||
}
|
||||
}
|
||||
runHook postBuild
|
||||
'';
|
||||
})
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
, cjs
|
||||
, evolution-data-server
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, gdk-pixbuf
|
||||
, gettext
|
||||
, libgnomekbd
|
||||
|
|
@ -84,6 +85,13 @@ stdenv.mkDerivation rec {
|
|||
patches = [
|
||||
./use-sane-install-dir.patch
|
||||
./libdir.patch
|
||||
|
||||
# Backport pillow 10.0.0 support.
|
||||
# https://github.com/linuxmint/cinnamon/issues/11746
|
||||
(fetchpatch {
|
||||
url = "https://github.com/linuxmint/cinnamon/commit/fce9aad1ebb290802dc550e8dae6344dddf9dec1.patch";
|
||||
hash = "sha256-flt7CblfXlLieAVNeC8TBnv1TX0Zca1obPWusBMnIxE=";
|
||||
})
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ stdenv
|
||||
, lib
|
||||
, fetchurl
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, pkg-config
|
||||
, meson
|
||||
, ninja
|
||||
|
|
@ -43,6 +43,15 @@ stdenv.mkDerivation rec {
|
|||
sha256 = "sha256-iNUhcHG4nCZ4WNELodyLdztzfNg9g+F0eQrZHXS6Zj0=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix build with exiv2 0.28, can be removed on next update
|
||||
# https://github.com/linuxmint/pix/pull/178
|
||||
(fetchpatch {
|
||||
url = "https://github.com/linuxmint/pix/commit/46e19703a973d51fa97e6a22121560f5ba200eea.patch";
|
||||
sha256 = "sha256-Z+pUxoy0m/agXW++YxEUhRuax0qvuGVXNhU8d9mvGh4=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
bison
|
||||
desktop-file-utils
|
||||
|
|
|
|||
|
|
@ -27,5 +27,6 @@ stdenv.mkDerivation rec {
|
|||
license = licenses.lgpl21Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ ];
|
||||
pkgConfigModules = [ "libthai" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -119,5 +119,14 @@ stdenv.mkDerivation rec {
|
|||
|
||||
maintainers = with maintainers; [ raskin ] ++ teams.gnome.members;
|
||||
platforms = platforms.unix;
|
||||
|
||||
pkgConfigModules = [
|
||||
"pango"
|
||||
"pangocairo"
|
||||
"pangofc"
|
||||
"pangoft2"
|
||||
"pangoot"
|
||||
"pangoxft"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -57,5 +57,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
platforms = lib.platforms.all;
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
pkgConfigModules = [
|
||||
"libpcre"
|
||||
"libpcreposix"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -64,6 +64,7 @@
|
|||
postcss-cli = "postcss";
|
||||
prettier = "prettier";
|
||||
purescript-psa = "psa";
|
||||
purs-tidy = "purs-tidy";
|
||||
react-native-cli = "react-native";
|
||||
react-tools = "jsx";
|
||||
remod-cli = "remod";
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
{ lib
|
||||
, astropy
|
||||
, astropy-helpers
|
||||
, buildPythonPackage
|
||||
, cython
|
||||
, fetchpatch
|
||||
, fetchPypi
|
||||
, matplotlib
|
||||
|
|
@ -15,7 +13,10 @@
|
|||
, pythonOlder
|
||||
, reproject
|
||||
, scikit-image
|
||||
, setuptools
|
||||
, setuptools-scm
|
||||
, shapely
|
||||
, wheel
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
|
|
@ -32,12 +33,13 @@ buildPythonPackage rec {
|
|||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
astropy-helpers
|
||||
setuptools
|
||||
setuptools-scm
|
||||
wheel
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
astropy
|
||||
cython
|
||||
matplotlib
|
||||
numpy
|
||||
pillow
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "bellows";
|
||||
version = "0.35.8";
|
||||
version = "0.35.9";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -24,7 +24,7 @@ buildPythonPackage rec {
|
|||
owner = "zigpy";
|
||||
repo = "bellows";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-N0Rxa685jWAvlvCTUw3SKF+VqnkIaKyXPU58o9VOrjE=";
|
||||
hash = "sha256-68t6l7/30euGo0dX5HTnGMl65j6UVF2f9fYZH6EhlzI=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,9 +1,11 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, fetchpatch
|
||||
, pythonOlder
|
||||
, setuptools
|
||||
, versioningit
|
||||
, wheel
|
||||
, numpy
|
||||
, matplotlib
|
||||
, schema
|
||||
|
|
@ -20,10 +22,29 @@ buildPythonPackage rec {
|
|||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-e+LAcmWxT+SkaWtToPgg+x3QRu5fCSm+w4dLCcyZrw8=";
|
||||
hash = "sha256-e+LAcmWxT+SkaWtToPgg+x3QRu5fCSm+w4dLCcyZrw8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools versioningit ];
|
||||
patches = [
|
||||
# https://github.com/QCoDeS/broadbean/pull/538
|
||||
(fetchpatch {
|
||||
name = "drop-wheel-from-pyproject.patch";
|
||||
url = "https://github.com/QCoDeS/broadbean/commit/31a2147e4f452fef1ca2b56b1cb0b10ac85ac867.patch";
|
||||
hash = "sha256-lBikIRhaf3ecwE7NZrYWeHkQCHQdfS9eeOcFExGIsVk=";
|
||||
})
|
||||
# https://github.com/QCoDeS/broadbean/pull/638
|
||||
(fetchpatch {
|
||||
name = "unpin-versioningit-dependency.patch";
|
||||
url = "https://github.com/QCoDeS/broadbean/commit/e4fd6c38d076aa3a6542dcd8fa7d2eb9d7a9b789.patch";
|
||||
hash = "sha256-mw68pWAjztWBw22MeoWVbwIwjzMOJRtv6HctN3v6A2A=";
|
||||
})
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
versioningit
|
||||
wheel
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@
|
|||
, dvc-objects
|
||||
, fetchFromGitHub
|
||||
, funcy
|
||||
, nanotime
|
||||
, pygtrie
|
||||
, pythonOlder
|
||||
, setuptools-scm
|
||||
|
|
@ -15,7 +14,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-data";
|
||||
version = "2.11.0";
|
||||
version = "2.12.1";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -24,7 +23,7 @@ buildPythonPackage rec {
|
|||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-Nqxaw5gGlKZCwTquNY/6z4b8l762mnrhHyvrteVzdHE=";
|
||||
hash = "sha256-BmI2D1nMeqcV0jPMJ6jzHO38AscfzDMgwh91ekKlXEs=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
@ -38,7 +37,6 @@ buildPythonPackage rec {
|
|||
diskcache
|
||||
dvc-objects
|
||||
funcy
|
||||
nanotime
|
||||
pygtrie
|
||||
shortuuid
|
||||
sqltrie
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc-studio-client";
|
||||
version = "0.11.0";
|
||||
version = "0.12.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
|
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
|||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-bjwIle7O/qwwhhK+wa2/36EO/F1kjsORJjGyASypwVE=";
|
||||
hash = "sha256-Y2SMcz7aaYH1k4ieLwEijBkf6AMbCltsXBocafIVMcM=";
|
||||
};
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
|
|
|||
|
|
@ -1,14 +1,59 @@
|
|||
{ lib
|
||||
, python3
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, pythonOlder
|
||||
, pythonRelaxDepsHook
|
||||
, setuptools-scm
|
||||
, appdirs
|
||||
, colorama
|
||||
, configobj
|
||||
, distro
|
||||
, dpath
|
||||
, dvc-azure
|
||||
, dvc-data
|
||||
, dvc-gs
|
||||
, dvc-http
|
||||
, dvc-render
|
||||
, dvc-s3
|
||||
, dvc-ssh
|
||||
, dvc-studio-client
|
||||
, dvc-task
|
||||
, flatten-dict
|
||||
, flufl_lock
|
||||
, funcy
|
||||
, grandalf
|
||||
, hydra-core
|
||||
, importlib-metadata
|
||||
, importlib-resources
|
||||
, iterative-telemetry
|
||||
, networkx
|
||||
, packaging
|
||||
, pathspec
|
||||
, platformdirs
|
||||
, psutil
|
||||
, pydot
|
||||
, pygtrie
|
||||
, pyparsing
|
||||
, requests
|
||||
, rich
|
||||
, ruamel-yaml
|
||||
, scmrepo
|
||||
, shortuuid
|
||||
, shtab
|
||||
, tabulate
|
||||
, tomlkit
|
||||
, tqdm
|
||||
, typing-extensions
|
||||
, voluptuous
|
||||
, zc_lockfile
|
||||
, enableGoogle ? false
|
||||
, enableAWS ? false
|
||||
, enableAzure ? false
|
||||
, enableSSH ? false
|
||||
}:
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
buildPythonPackage rec {
|
||||
pname = "dvc";
|
||||
version = "3.8.1";
|
||||
format = "pyproject";
|
||||
|
|
@ -31,12 +76,12 @@ python3.pkgs.buildPythonApplication rec {
|
|||
--subst-var-by dvc "$out/bin/dcv"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
nativeBuildInputs = [
|
||||
pythonRelaxDepsHook
|
||||
setuptools-scm
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
propagatedBuildInputs = [
|
||||
appdirs
|
||||
colorama
|
||||
configobj
|
||||
|
|
@ -73,20 +118,24 @@ python3.pkgs.buildPythonApplication rec {
|
|||
typing-extensions
|
||||
voluptuous
|
||||
zc_lockfile
|
||||
] ++ lib.optionals enableGoogle [
|
||||
dvc-gs
|
||||
] ++ lib.optionals enableAWS [
|
||||
dvc-s3
|
||||
] ++ lib.optionals enableAzure [
|
||||
dvc-azure
|
||||
] ++ lib.optionals enableSSH [
|
||||
dvc-ssh
|
||||
] ++ lib.optionals (pythonOlder "3.8") [
|
||||
]
|
||||
++ lib.optionals enableGoogle passthru.optional-dependencies.gs
|
||||
++ lib.optionals enableAWS passthru.optional-dependencies.s3
|
||||
++ lib.optionals enableAzure passthru.optional-dependencies.azure
|
||||
++ lib.optionals enableSSH passthru.optional-dependencies.ssh
|
||||
++ lib.optionals (pythonOlder "3.8") [
|
||||
importlib-metadata
|
||||
] ++ lib.optionals (pythonOlder "3.9") [
|
||||
importlib-resources
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = {
|
||||
azure = [ dvc-azure ];
|
||||
gs = [ dvc-gs ];
|
||||
s3 = [ dvc-s3 ];
|
||||
ssh = [ dvc-ssh ];
|
||||
};
|
||||
|
||||
# Tests require access to real cloud services
|
||||
doCheck = false;
|
||||
|
||||
|
|
@ -1,13 +1,14 @@
|
|||
{ lib
|
||||
, absl-py
|
||||
, blas
|
||||
, buildPythonPackage
|
||||
, etils
|
||||
, setuptools
|
||||
, importlib-metadata
|
||||
, fetchFromGitHub
|
||||
, jaxlib
|
||||
, jaxlib-bin
|
||||
, lapack
|
||||
, matplotlib
|
||||
, ml-dtypes
|
||||
, numpy
|
||||
, opt-einsum
|
||||
, pytestCheckHook
|
||||
|
|
@ -15,7 +16,6 @@
|
|||
, pythonOlder
|
||||
, scipy
|
||||
, stdenv
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
let
|
||||
|
|
@ -27,30 +27,32 @@ let
|
|||
in
|
||||
buildPythonPackage rec {
|
||||
pname = "jax";
|
||||
version = "0.4.5";
|
||||
format = "setuptools";
|
||||
version = "0.4.14";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
disabled = pythonOlder "3.9";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = pname;
|
||||
# google/jax contains tags for jax and jaxlib. Only use jax tags!
|
||||
rev = "refs/tags/${pname}-v${version}";
|
||||
hash = "sha256-UJzX8zP3qaEUIV5hPJhiGiLJO7k8p962MHWxIHDY1ZA=";
|
||||
hash = "sha256-0KnILQkahSiA1uuyT+kgy1XaCcZ3cpx1q114e2pecvg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
];
|
||||
|
||||
# jaxlib is _not_ included in propagatedBuildInputs because there are
|
||||
# different versions of jaxlib depending on the desired target hardware. The
|
||||
# JAX project ships separate wheels for CPU, GPU, and TPU.
|
||||
propagatedBuildInputs = [
|
||||
absl-py
|
||||
etils
|
||||
ml-dtypes
|
||||
numpy
|
||||
opt-einsum
|
||||
scipy
|
||||
typing-extensions
|
||||
] ++ etils.optional-dependencies.epath;
|
||||
] ++ lib.optional (pythonOlder "3.10") importlib-metadata;
|
||||
|
||||
nativeCheckInputs = [
|
||||
jaxlib'
|
||||
|
|
@ -96,24 +98,12 @@ buildPythonPackage rec {
|
|||
"testScanGrad_jit_scan"
|
||||
];
|
||||
|
||||
# See https://github.com/google/jax/issues/11722. This is a temporary fix in
|
||||
# order to unblock etils, and upgrading jax/jaxlib to the latest version. See
|
||||
# https://github.com/NixOS/nixpkgs/issues/183173#issuecomment-1204074993.
|
||||
disabledTestPaths = [
|
||||
"tests/api_test.py"
|
||||
"tests/core_test.py"
|
||||
"tests/lax_numpy_indexing_test.py"
|
||||
"tests/lax_numpy_test.py"
|
||||
"tests/nn_test.py"
|
||||
"tests/random_test.py"
|
||||
"tests/sparse_test.py"
|
||||
] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
|
||||
disabledTestPaths = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
|
||||
# RuntimeWarning: invalid value encountered in cast
|
||||
"tests/lax_test.py"
|
||||
];
|
||||
|
||||
# As of 0.3.22, `import jax` does not work without jaxlib being installed.
|
||||
pythonImportsCheck = [ ];
|
||||
pythonImportsCheck = [ "jax" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Differentiate, compile, and transform Numpy code";
|
||||
|
|
|
|||
|
|
@ -18,11 +18,12 @@
|
|||
, autoPatchelfHook
|
||||
, buildPythonPackage
|
||||
, config
|
||||
, cudnn ? cudaPackages.cudnn
|
||||
, fetchPypi
|
||||
, fetchurl
|
||||
, flatbuffers
|
||||
, isPy39
|
||||
, jaxlib-build
|
||||
, lib
|
||||
, ml-dtypes
|
||||
, python
|
||||
, scipy
|
||||
, stdenv
|
||||
|
|
@ -35,46 +36,57 @@ let
|
|||
inherit (cudaPackages) cudatoolkit cudnn;
|
||||
in
|
||||
|
||||
assert cudaSupport -> lib.versionAtLeast cudatoolkit.version "11.1";
|
||||
assert cudaSupport -> lib.versionAtLeast cudnn.version "8.2";
|
||||
assert cudaSupport -> lib.versionAtLeast cudatoolkit.version "11.1" && lib.versionAtLeast cudnn.version "8.2" && stdenv.isLinux;
|
||||
|
||||
let
|
||||
version = "0.4.4";
|
||||
version = "0.4.14";
|
||||
|
||||
inherit (python) pythonVersion;
|
||||
|
||||
# As of 2023-06-06, google/jax upstream is no longer publishing CPU-only wheels to their GCS bucket. Instead the
|
||||
# official instructions recommend installing CPU-only versions via PyPI.
|
||||
cpuSrcs =
|
||||
let
|
||||
getSrcFromPypi = { platform, hash }: fetchPypi {
|
||||
inherit version platform hash;
|
||||
pname = "jaxlib";
|
||||
format = "wheel";
|
||||
# See the `disabled` attr comment below.
|
||||
dist = "cp310";
|
||||
python = "cp310";
|
||||
abi = "cp310";
|
||||
};
|
||||
in
|
||||
{
|
||||
"x86_64-linux" = getSrcFromPypi {
|
||||
platform = "manylinux2014_x86_64";
|
||||
hash = "sha256-nyylSZfqHeftlvVgJZFCN1ldjluZVJIYu4ZSsVxvXf8=";
|
||||
};
|
||||
"aarch64-darwin" = getSrcFromPypi {
|
||||
platform = "macosx_11_0_arm64";
|
||||
hash = "sha256-La3wYbGCjWTl7krBD6BaBRqyBD8R530Lckbz0AWv0FM=";
|
||||
};
|
||||
"x86_64-darwin" = getSrcFromPypi {
|
||||
platform = "macosx_10_14_x86_64";
|
||||
hash = "sha256-hDg5+qisgtgOrdvbjxsUgI73cW6Aah8NLjhPe4kMAsM=";
|
||||
};
|
||||
};
|
||||
|
||||
pythonVersion = python.pythonVersion;
|
||||
|
||||
# Find new releases at https://storage.googleapis.com/jax-releases/jax_releases.html.
|
||||
# When upgrading, you can get these hashes from prefetch.sh. See
|
||||
# https://github.com/google/jax/issues/12879 as to why this specific URL is
|
||||
# the correct index.
|
||||
cpuSrcs = {
|
||||
"x86_64-linux" = fetchurl {
|
||||
url = "https://storage.googleapis.com/jax-releases/nocuda/jaxlib-${version}-cp310-cp310-manylinux2014_x86_64.whl";
|
||||
hash = "sha256-4VT909AB+ti5HzQvsaZWNY6MS/GItlVEFH9qeZnUuKQ=";
|
||||
};
|
||||
"aarch64-darwin" = fetchurl {
|
||||
url = "https://storage.googleapis.com/jax-releases/mac/jaxlib-${version}-cp310-cp310-macosx_11_0_arm64.whl";
|
||||
hash = "sha256-wuOmoCeTldslSa0MommQeTe+RYKhUMam1ZXrgSov+8U=";
|
||||
};
|
||||
"x86_64-darwin" = fetchurl {
|
||||
url = "https://storage.googleapis.com/jax-releases/mac/jaxlib-${version}-cp310-cp310-macosx_10_14_x86_64.whl";
|
||||
hash = "sha256-arfiTw8yafJwjRwJhKby2O7y3+4ksh3PjaKW9JgJ1ok=";
|
||||
};
|
||||
# https://github.com/google/jax/issues/12879 as to why this specific URL is the correct index.
|
||||
gpuSrc = fetchurl {
|
||||
url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn86-cp310-cp310-manylinux2014_x86_64.whl";
|
||||
hash = "sha256-CcQ5kjp4XfUX4/RwFY3T5G3kVKAeyoCTXu1Lo4O16Qo=";
|
||||
};
|
||||
|
||||
gpuSrc = fetchurl {
|
||||
url = "https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn82-cp310-cp310-manylinux2014_x86_64.whl";
|
||||
hash = "sha256-bJ62DdzuPSV311ZI2R/LJQ3fOkDibtz2+8wDKw31FLk=";
|
||||
};
|
||||
in
|
||||
buildPythonPackage rec {
|
||||
buildPythonPackage {
|
||||
pname = "jaxlib";
|
||||
inherit version;
|
||||
format = "wheel";
|
||||
|
||||
# At the time of writing (2022-10-19), there are releases for <=3.10.
|
||||
# Supporting all of them is a pain, so we focus on 3.10, the current nixpkgs
|
||||
# python version.
|
||||
disabled = !(pythonVersion == "3.10");
|
||||
|
||||
# See https://discourse.nixos.org/t/ofborg-does-not-respect-meta-platforms/27019/6.
|
||||
|
|
@ -87,9 +99,10 @@ buildPythonPackage rec {
|
|||
|
||||
# Prebuilt wheels are dynamically linked against things that nix can't find.
|
||||
# Run `autoPatchelfHook` to automagically fix them.
|
||||
nativeBuildInputs = lib.optionals cudaSupport [ autoPatchelfHook addOpenGLRunpath ];
|
||||
nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]
|
||||
++ lib.optionals cudaSupport [ addOpenGLRunpath ];
|
||||
# Dynamic link dependencies
|
||||
buildInputs = [ stdenv.cc.cc ];
|
||||
buildInputs = [ stdenv.cc.cc.lib ];
|
||||
|
||||
# jaxlib contains shared libraries that open other shared libraries via dlopen
|
||||
# and these implicit dependencies are not recognized by ldd or
|
||||
|
|
@ -113,7 +126,12 @@ buildPythonPackage rec {
|
|||
done
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ absl-py flatbuffers scipy ];
|
||||
propagatedBuildInputs = [
|
||||
absl-py
|
||||
flatbuffers
|
||||
ml-dtypes
|
||||
scipy
|
||||
];
|
||||
|
||||
# Note that cudatoolkit is snecessary since jaxlib looks for "ptxas" in $PATH.
|
||||
# See https://github.com/NixOS/nixpkgs/pull/164176#discussion_r828801621 for
|
||||
|
|
@ -123,7 +141,7 @@ buildPythonPackage rec {
|
|||
ln -s ${cudatoolkit}/bin/ptxas $out/bin/ptxas
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "jaxlib" ];
|
||||
inherit (jaxlib-build) pythonImportsCheck;
|
||||
|
||||
meta = with lib; {
|
||||
description = "XLA library for JAX";
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
# Build-time dependencies:
|
||||
, addOpenGLRunpath
|
||||
, bazel_5
|
||||
, bazel_6
|
||||
, binutils
|
||||
, buildBazelPackage
|
||||
, buildPythonPackage
|
||||
|
|
@ -21,11 +21,13 @@
|
|||
, setuptools
|
||||
, symlinkJoin
|
||||
, wheel
|
||||
, build
|
||||
, which
|
||||
|
||||
# Python dependencies:
|
||||
, absl-py
|
||||
, flatbuffers
|
||||
, ml-dtypes
|
||||
, numpy
|
||||
, scipy
|
||||
, six
|
||||
|
|
@ -35,7 +37,6 @@
|
|||
, giflib
|
||||
, grpc
|
||||
, libjpeg_turbo
|
||||
, protobuf
|
||||
, python
|
||||
, snappy
|
||||
, zlib
|
||||
|
|
@ -53,7 +54,7 @@ let
|
|||
inherit (cudaPackages) backendStdenv cudatoolkit cudaFlags cudnn nccl;
|
||||
|
||||
pname = "jaxlib";
|
||||
version = "0.4.4";
|
||||
version = "0.4.14";
|
||||
|
||||
meta = with lib; {
|
||||
description = "JAX is Autograd and XLA, brought together for high-performance machine learning research.";
|
||||
|
|
@ -99,7 +100,9 @@ let
|
|||
# "com_github_googleapis_googleapis"
|
||||
# "com_github_googlecloudplatform_google_cloud_cpp"
|
||||
"com_github_grpc_grpc"
|
||||
"com_google_protobuf"
|
||||
# ERROR: /build/output/external/bazel_tools/tools/proto/BUILD:25:6: no such target '@com_google_protobuf//:cc_toolchain':
|
||||
# target 'cc_toolchain' not declared in package '' defined by /build/output/external/com_google_protobuf/BUILD.bazel
|
||||
# "com_google_protobuf"
|
||||
# Fails with the error: external/org_tensorflow/tensorflow/core/profiler/utils/tf_op_utils.cc:46:49: error: no matching function for call to 're2::RE2::FullMatch(absl::lts_2020_02_25::string_view&, re2::RE2&)'
|
||||
# "com_googlesource_code_re2"
|
||||
"curl"
|
||||
|
|
@ -120,7 +123,9 @@ let
|
|||
"org_sqlite"
|
||||
"pasta"
|
||||
"png"
|
||||
"pybind11"
|
||||
# ERROR: /build/output/external/pybind11/BUILD.bazel: no such target '@pybind11//:osx':
|
||||
# target 'osx' not declared in package '' defined by /build/output/external/pybind11/BUILD.bazel
|
||||
# "pybind11"
|
||||
"six_archive"
|
||||
"snappy"
|
||||
"tblib_archive"
|
||||
|
|
@ -138,14 +143,15 @@ let
|
|||
bazel-build = buildBazelPackage rec {
|
||||
name = "bazel-build-${pname}-${version}";
|
||||
|
||||
bazel = bazel_5;
|
||||
# See https://github.com/google/jax/blob/main/.bazelversion for the latest.
|
||||
bazel = bazel_6;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "jax";
|
||||
# google/jax contains tags for jax and jaxlib. Only use jaxlib tags!
|
||||
rev = "refs/tags/${pname}-v${version}";
|
||||
hash = "sha256-DP68UwS9bg243iWU4MLHN0pwl8LaOcW3Sle1ZjsLOHo=";
|
||||
hash = "sha256-0KnILQkahSiA1uuyT+kgy1XaCcZ3cpx1q114e2pecvg=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
@ -154,6 +160,7 @@ let
|
|||
git
|
||||
setuptools
|
||||
wheel
|
||||
build
|
||||
which
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
cctools
|
||||
|
|
@ -169,7 +176,7 @@ let
|
|||
numpy
|
||||
openssl
|
||||
pkgs.flatbuffers
|
||||
protobuf
|
||||
pkgs.protobuf
|
||||
pybind11
|
||||
scipy
|
||||
six
|
||||
|
|
@ -188,7 +195,8 @@ let
|
|||
rm -f .bazelversion
|
||||
'';
|
||||
|
||||
bazelTargets = [ "//build:build_wheel" ];
|
||||
bazelRunTarget = "//jaxlib/tools:build_wheel";
|
||||
runTargetFlags = [ "--output_path=$out" "--cpu=${arch}" ];
|
||||
|
||||
removeRulesCC = false;
|
||||
|
||||
|
|
@ -207,7 +215,11 @@ let
|
|||
build --action_env=PYENV_ROOT
|
||||
build --python_path="${python}/bin/python"
|
||||
build --distinct_host_configuration=false
|
||||
build --define PROTOBUF_INCLUDE_PATH="${protobuf}/include"
|
||||
build --define PROTOBUF_INCLUDE_PATH="${pkgs.protobuf}/include"
|
||||
'' + lib.optionalString (stdenv.targetPlatform.avxSupport && stdenv.targetPlatform.isUnix) ''
|
||||
build --config=avx_posix
|
||||
'' + lib.optionalString mklSupport ''
|
||||
build --config=mkl_open_source_only
|
||||
'' + lib.optionalString cudaSupport ''
|
||||
build --action_env CUDA_TOOLKIT_PATH="${cudatoolkit_joined}"
|
||||
build --action_env CUDNN_INSTALL_PATH="${cudnn}"
|
||||
|
|
@ -234,7 +246,7 @@ let
|
|||
fetchAttrs = {
|
||||
TF_SYSTEM_LIBS = lib.concatStringsSep "," tf_system_libs;
|
||||
# we have to force @mkl_dnn_v1 since it's not needed on darwin
|
||||
bazelTargets = bazelTargets ++ [ "@mkl_dnn_v1//:mkl_dnn" ];
|
||||
bazelTargets = [ bazelRunTarget "@mkl_dnn_v1//:mkl_dnn" ];
|
||||
bazelFlags = bazelFlags ++ [
|
||||
"--config=avx_posix"
|
||||
] ++ lib.optionals cudaSupport [
|
||||
|
|
@ -247,11 +259,12 @@ let
|
|||
"--config=mkl_open_source_only"
|
||||
];
|
||||
|
||||
sha256 =
|
||||
if cudaSupport then
|
||||
"sha256-O6bM7Lc8eaFyO4Xzl5/hvBrbPioI+Yeqx9yNC97fvKk="
|
||||
else
|
||||
"sha256-gLMJfJSQIdGGY2Ivx4IgDWg0hc+mxzlqY11CUkSWcjI=";
|
||||
sha256 = (if cudaSupport then {
|
||||
x86_64-linux = "sha256-8QaXoZq6oITRsYn4RdLUXcKQv3PJ4Q3ItX9PkBwxGBI=";
|
||||
} else {
|
||||
x86_64-linux = "sha256-M/h5EZmyiV4QvzgKRjdz7V1LHENUJlc/ig1QAItnWVQ=";
|
||||
aarch64-linux = "sha256-edkYcdlvOLNGRSanch1fGCZwq8SFn3TzcUNt1LhzG/E=";
|
||||
}).${stdenv.system} or (throw "jaxlib: unsupported system: ${stdenv.system}");
|
||||
};
|
||||
|
||||
buildAttrs = {
|
||||
|
|
@ -261,25 +274,13 @@ let
|
|||
"nsync" # fails to build on darwin
|
||||
]);
|
||||
|
||||
bazelFlags = bazelFlags ++ lib.optionals (stdenv.targetPlatform.isx86_64 && stdenv.targetPlatform.isUnix) [
|
||||
"--config=avx_posix"
|
||||
] ++ lib.optionals cudaSupport [
|
||||
"--config=cuda"
|
||||
] ++ lib.optionals mklSupport [
|
||||
"--config=mkl_open_source_only"
|
||||
];
|
||||
# Note: we cannot do most of this patching at `patch` phase as the deps are not available yet.
|
||||
# 1) Fix pybind11 include paths.
|
||||
# 2) Link protobuf from nixpkgs (through TF_SYSTEM_LIBS when using gcc) to prevent crashes on
|
||||
# 1) Link protobuf from nixpkgs (through TF_SYSTEM_LIBS when using gcc) to prevent crashes on
|
||||
# loading multiple extensions in the same python program due to duplicate protobuf DBs.
|
||||
# 3) Patch python path in the compiler driver.
|
||||
preBuild = ''
|
||||
for src in ./jaxlib/*.{cc,h} ./jaxlib/cuda/*.{cc,h}; do
|
||||
sed -i 's@include/pybind11@pybind11@g' $src
|
||||
done
|
||||
'' + lib.optionalString cudaSupport ''
|
||||
# 2) Patch python path in the compiler driver.
|
||||
preBuild = lib.optionalString cudaSupport ''
|
||||
export NIX_LDFLAGS+=" -L${backendStdenv.nixpkgsCompatibleLibstdcxx}/lib"
|
||||
patchShebangs ../output/external/org_tensorflow/third_party/gpus/crosstool/clang/bin/crosstool_wrapper_driver_is_not_gcc.tpl
|
||||
patchShebangs ../output/external/xla/third_party/gpus/crosstool/clang/bin/crosstool_wrapper_driver_is_not_gcc.tpl
|
||||
'' + lib.optionalString stdenv.isDarwin ''
|
||||
# Framework search paths aren't added by bintools hook
|
||||
# https://github.com/NixOS/nixpkgs/pull/41914
|
||||
|
|
@ -289,16 +290,12 @@ let
|
|||
substituteInPlace ../output/external/rules_cc/cc/private/toolchain/unix_cc_configure.bzl \
|
||||
--replace "/usr/bin/libtool" "${cctools}/bin/libtool"
|
||||
'' + (if stdenv.cc.isGNU then ''
|
||||
sed -i 's@-lprotobuf@-l:libprotobuf.a@' ../output/external/org_tensorflow/third_party/systemlibs/protobuf.BUILD
|
||||
sed -i 's@-lprotoc@-l:libprotoc.a@' ../output/external/org_tensorflow/third_party/systemlibs/protobuf.BUILD
|
||||
sed -i 's@-lprotobuf@-l:libprotobuf.a@' ../output/external/xla/third_party/systemlibs/protobuf.BUILD
|
||||
sed -i 's@-lprotoc@-l:libprotoc.a@' ../output/external/xla/third_party/systemlibs/protobuf.BUILD
|
||||
'' else if stdenv.cc.isClang then ''
|
||||
sed -i 's@-lprotobuf@${protobuf}/lib/libprotobuf.a@' ../output/external/org_tensorflow/third_party/systemlibs/protobuf.BUILD
|
||||
sed -i 's@-lprotoc@${protobuf}/lib/libprotoc.a@' ../output/external/org_tensorflow/third_party/systemlibs/protobuf.BUILD
|
||||
sed -i 's@-lprotobuf@${pkgs.protobuf}/lib/libprotobuf.a@' ../output/external/xla/third_party/systemlibs/protobuf.BUILD
|
||||
sed -i 's@-lprotoc@${pkgs.protobuf}/lib/libprotoc.a@' ../output/external/xla/third_party/systemlibs/protobuf.BUILD
|
||||
'' else throw "Unsupported stdenv.cc: ${stdenv.cc}");
|
||||
|
||||
installPhase = ''
|
||||
./bazel-bin/build/build_wheel --output_path=$out --cpu=${arch}
|
||||
'';
|
||||
};
|
||||
|
||||
inherit meta;
|
||||
|
|
@ -345,13 +342,19 @@ buildPythonPackage {
|
|||
grpc
|
||||
jsoncpp
|
||||
libjpeg_turbo
|
||||
ml-dtypes
|
||||
numpy
|
||||
scipy
|
||||
six
|
||||
snappy
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "jaxlib" ];
|
||||
pythonImportsCheck = [
|
||||
"jaxlib"
|
||||
# `import jaxlib` loads surprisingly little. These imports are actually bugs that appeared in the 0.4.11 upgrade.
|
||||
"jaxlib.cpu_feature_guard"
|
||||
"jaxlib.xla_client"
|
||||
];
|
||||
|
||||
# Without it there are complaints about libcudart.so.11.0 not being found
|
||||
# because RPATH path entries added above are stripped.
|
||||
|
|
|
|||
|
|
@ -1,7 +1,15 @@
|
|||
version="$1"
|
||||
nix hash to-sri --type sha256 "$(nix-prefetch-url https://storage.googleapis.com/jax-releases/nocuda/jaxlib-${version}-cp39-none-manylinux2010_x86_64.whl)"
|
||||
nix hash to-sri --type sha256 "$(nix-prefetch-url https://storage.googleapis.com/jax-releases/nocuda/jaxlib-${version}-cp310-none-manylinux2010_x86_64.whl)"
|
||||
nix hash to-sri --type sha256 "$(nix-prefetch-url https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn805-cp39-none-manylinux2010_x86_64.whl)"
|
||||
nix hash to-sri --type sha256 "$(nix-prefetch-url https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn82-cp39-none-manylinux2010_x86_64.whl)"
|
||||
nix hash to-sri --type sha256 "$(nix-prefetch-url https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn805-cp310-none-manylinux2010_x86_64.whl)"
|
||||
nix hash to-sri --type sha256 "$(nix-prefetch-url https://storage.googleapis.com/jax-releases/cuda11/jaxlib-${version}+cuda11.cudnn82-cp310-none-manylinux2010_x86_64.whl)"
|
||||
#!/usr/bin/env bash
|
||||
|
||||
prefetch () {
|
||||
expr="(import <nixpkgs> { system = \"$1\"; config.cudaSupport = $2; }).python3.pkgs.jaxlib-bin.src.url"
|
||||
url=$(NIX_PATH=.. nix-instantiate --eval -E "$expr" | jq -r)
|
||||
echo "$url"
|
||||
sha256=$(nix-prefetch-url "$url")
|
||||
nix hash to-sri --type sha256 "$sha256"
|
||||
echo
|
||||
}
|
||||
|
||||
prefetch "x86_64-linux" "false"
|
||||
prefetch "aarch64-darwin" "false"
|
||||
prefetch "x86_64-darwin" "false"
|
||||
prefetch "x86_64-linux" "true"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,47 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, gitpython
|
||||
, mkdocs
|
||||
, pytz
|
||||
, pytestCheckHook
|
||||
, git
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "mkdocs-git-revision-date-localized-plugin";
|
||||
version = "1.2.0";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "timvink";
|
||||
repo = "mkdocs-git-revision-date-localized-plugin";
|
||||
rev = "v${version}" ;
|
||||
hash = "sha256-l7NUmsdd1FHkbdqtRcMQBfplZJgLCXrN+QuYaQLpz0k=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
gitpython
|
||||
mkdocs
|
||||
pytz
|
||||
];
|
||||
|
||||
nativeCheckInputs = [ pytestCheckHook ];
|
||||
|
||||
disabledTestPaths = [
|
||||
"tests/test_builds.py"
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "mkdocs_git_revision_date_localized_plugin" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "MkDocs plugin that enables displaying the date of the last git modification of a page";
|
||||
homepage = "https://github.com/timvink/mkdocs-git-revision-date-localized-plugin";
|
||||
changelog = "https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ totoroot ];
|
||||
};
|
||||
}
|
||||
60
pkgs/development/python-modules/ml-dtypes/default.nix
Normal file
60
pkgs/development/python-modules/ml-dtypes/default.nix
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, pythonOlder
|
||||
, fetchFromGitHub
|
||||
, setuptools
|
||||
, pybind11
|
||||
, numpy
|
||||
, pytestCheckHook
|
||||
, absl-py
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ml-dtypes";
|
||||
version = "0.2.0";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jax-ml";
|
||||
repo = "ml_dtypes";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-eqajWUwylIYsS8gzEaCZLLr+1+34LXWhfKBjuwsEhhI=";
|
||||
# Since this upstream patch (https://github.com/jax-ml/ml_dtypes/commit/1bfd097e794413b0d465fa34f2eff0f3828ff521),
|
||||
# the attempts to use the nixpkgs packaged eigen dependency have failed.
|
||||
# Hence, we rely on the bundled eigen library.
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
setuptools
|
||||
pybind11
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
absl-py
|
||||
];
|
||||
|
||||
preCheck = ''
|
||||
# remove src module, so tests use the installed module instead
|
||||
mv ./ml_dtypes/tests ./tests
|
||||
rm -rf ./ml_dtypes
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [
|
||||
"ml_dtypes"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A stand-alone implementation of several NumPy dtype extensions used in machine learning libraries";
|
||||
homepage = "https://github.com/jax-ml/ml_dtypes";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ GaetanLepage samuela ];
|
||||
};
|
||||
}
|
||||
|
|
@ -6,17 +6,22 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "nclib";
|
||||
version = "1.0.3";
|
||||
disabled = pythonOlder "3.5";
|
||||
version = "1.0.5";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-26KjYMxJMj5ANb2ej9hVl689sAcGHp89QUkH2xiLhZk=";
|
||||
hash = "sha256-sKbISlL5hOBu1j6zWSib2HjJCvEoMrqdwzgG2keMqDE=";
|
||||
};
|
||||
|
||||
# Project has no tests
|
||||
doCheck = false;
|
||||
pythonImportsCheck = [ "nclib" ];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"nclib"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python module that provides netcat features";
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ buildPythonPackage rec {
|
|||
pyparsing
|
||||
numpy
|
||||
astropy
|
||||
cython
|
||||
];
|
||||
|
||||
# Upstream patches needed for the tests to pass
|
||||
|
|
|
|||
|
|
@ -16,12 +16,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "steamship";
|
||||
version = "2.17.18";
|
||||
version = "2.17.22";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-1pWSP+s1jjtuRWWoPD5CcYZzt9JSiGHPNxxkLXP+pkc=";
|
||||
hash = "sha256-PQI6r2DoarswjTc8jp+nrJqkmckQ6+eGuI0MU8kvnM8=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
|
|
|||
|
|
@ -41,5 +41,6 @@ stdenv.mkDerivation rec {
|
|||
platforms = platforms.linux;
|
||||
maintainers = [ ];
|
||||
license = lib.licenses.gpl2Plus;
|
||||
pkgConfigModules = [ "libselinux" ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -138,6 +138,13 @@ stdenv.mkDerivation rec {
|
|||
# https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/tree/README.licensing
|
||||
license = with licenses; [ gpl2Only gpl2Plus gpl3Plus lgpl21Plus bsd3 bsdOriginalUC publicDomain ];
|
||||
platforms = platforms.unix;
|
||||
pkgConfigModules = [
|
||||
"blkid"
|
||||
"fdisk"
|
||||
"mount"
|
||||
"smartcols"
|
||||
"uuid"
|
||||
];
|
||||
priority = 6; # lower priority than coreutils ("kill") and shadow ("login" etc.) packages
|
||||
};
|
||||
}
|
||||
|
|
|
|||
5268
pkgs/servers/sql/sqld/Cargo.lock
generated
Normal file
5268
pkgs/servers/sql/sqld/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load diff
57
pkgs/servers/sql/sqld/default.nix
Normal file
57
pkgs/servers/sql/sqld/default.nix
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
{ lib
|
||||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, protobuf
|
||||
, openssl
|
||||
, sqlite
|
||||
, zstd
|
||||
, stdenv
|
||||
, darwin
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "sqld";
|
||||
version = "0.17.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "libsql";
|
||||
repo = "sqld";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-KoEscrzkFJnxxJKL/2r4cY0oLpKdQMjFR3daryzrVKQ=";
|
||||
};
|
||||
|
||||
cargoLock = {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"libsqlite3-sys-0.26.0" = "sha256-JzSGpqYtkIq0mVYD0kERIB6rmZUttqkCGne+M4vqTJU=";
|
||||
"octopod-0.1.0" = "sha256-V16fOlIp9BCpyzgh1Aei3Mra/y15v8dQFA8tHdOwZm4=";
|
||||
};
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
protobuf
|
||||
rustPlatform.bindgenHook
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
openssl
|
||||
sqlite
|
||||
zstd
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
env.ZSTD_SYS_USE_PKG_CONFIG = true;
|
||||
|
||||
# requires a complex setup with podman for the end-to-end tests
|
||||
doCheck = false;
|
||||
|
||||
meta = {
|
||||
description = "LibSQL with extended capabilities like HTTP protocol, replication, and more";
|
||||
homepage = "https://github.com/libsql/sqld";
|
||||
license = lib.licenses.mit;
|
||||
maintainers = with lib.maintainers; [ dit7ya ];
|
||||
};
|
||||
}
|
||||
36
pkgs/shells/zsh/zsh-fzf-history-search/default.nix
Normal file
36
pkgs/shells/zsh/zsh-fzf-history-search/default.nix
Normal file
|
|
@ -0,0 +1,36 @@
|
|||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
pname = "zsh-fzf-history-search";
|
||||
version = "unstable-2023-03-08";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "joshskidmore";
|
||||
repo = "zsh-fzf-history-search";
|
||||
rev = "d1aae98ccd6ce153c97a5401d79fd36418cd2958";
|
||||
hash = "sha256-4Dp2ehZLO83NhdBOKV0BhYFIvieaZPqiZZZtxsXWRaQ=";
|
||||
};
|
||||
|
||||
dontConfigure = true;
|
||||
dontBuild = true;
|
||||
strictDeps = true;
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
install -D zsh-fzf-history-search*.zsh --target-directory=$out/share/zsh-fzf-history-search
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "A simple zsh plugin that replaces Ctrl+R with an fzf-driven select which includes date/times";
|
||||
homepage = "https://github.com/joshskidmore/zsh-fzf-history-search";
|
||||
license = lib.licenses.mit;
|
||||
platforms = lib.platforms.unix;
|
||||
maintainers = with lib.maintainers; [ janik ];
|
||||
};
|
||||
}
|
||||
26
pkgs/tools/filesystems/upspin/default.nix
Normal file
26
pkgs/tools/filesystems/upspin/default.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ buildGoModule, fetchFromGitHub, lib }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "upspin";
|
||||
version = "unstable-2023-02-05";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "upspin";
|
||||
repo = "upspin";
|
||||
rev = "67e250ec27d8878c0009213b8e32c6803f2727ea";
|
||||
sha256 = "sha256-1pFDJSCUDKn4CTAg3wdB8oYPyrmd8B62zNl3m5YAqVM=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-Jl++FvKyqz5WFa/Eoly+UnFsoC9Qwdaizhkq6LyJ+XQ=";
|
||||
|
||||
# No upstream tests
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A global name space for storing data akin to a filesystem";
|
||||
homepage = "https://upspin.io";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ orthros ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
44
pkgs/tools/inputmethods/keymapper/default.nix
Normal file
44
pkgs/tools/inputmethods/keymapper/default.nix
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, dbus
|
||||
, libX11
|
||||
, libusb1
|
||||
, pkg-config
|
||||
, udev
|
||||
, wayland
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "keymapper";
|
||||
version = "2.6.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "houmain";
|
||||
repo = "keymapper";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-XCrEM9TR2nxw1GjkpDzXl4eYXu8peaJAIYXRCltSCj4=";
|
||||
};
|
||||
|
||||
# all the following must be in nativeBuildInputs
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
dbus
|
||||
wayland
|
||||
libX11
|
||||
udev
|
||||
libusb1
|
||||
];
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/houmain/keymapper/blob/${finalAttrs.src.rev}/CHANGELOG.md";
|
||||
description = "A cross-platform context-aware key remapper";
|
||||
homepage = "https://github.com/houmain/keymapper";
|
||||
license = lib.licenses.gpl3Only;
|
||||
mainProgram = "keymapper";
|
||||
maintainers = with lib.maintainers; [ dit7ya ];
|
||||
platforms = lib.platforms.linux;
|
||||
};
|
||||
})
|
||||
|
|
@ -1,20 +1,23 @@
|
|||
{ lib
|
||||
, buildGoModule
|
||||
, fetchFromGitHub
|
||||
, installShellFiles
|
||||
}:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "containerlab";
|
||||
version = "0.42.0";
|
||||
version = "0.43.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "srl-labs";
|
||||
repo = "containerlab";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-Vs3+5lnHy1QOisyq8heHlkE+Ezd6jDTFiTZUPxNQDnA=";
|
||||
hash = "sha256-Wo6Dfcdax8EjZRP5JBKrnxpFTVx0GV+7uaDgBY/zg6I=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-QaL4dlGw0az/hnYK20UOgh+AZ4wjhaopesJeN4zmeFE=";
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
vendorHash = "sha256-uaYeFzG74VTUrtql6mSi+LNh6IjDomixrWwGQMgmONc=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
|
@ -24,6 +27,14 @@ buildGoModule rec {
|
|||
"-X" "github.com/srl-labs/containerlab/cmd.date=1970-01-01T00:00:00Z"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
local INSTALL="$out/bin/containerlab"
|
||||
installShellCompletion --cmd containerlab \
|
||||
--bash <($out/bin/containerlab completion bash) \
|
||||
--fish <($out/bin/containerlab completion fish) \
|
||||
--zsh <($out/bin/containerlab completion zsh)
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Container-based networking lab";
|
||||
homepage = "https://containerlab.dev/";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libsodium, libevent }:
|
||||
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, libsodium, libevent, nixosTests }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "dnscrypt-wrapper";
|
||||
|
|
@ -13,9 +13,16 @@ stdenv.mkDerivation rec {
|
|||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# causes `dnscrypt-wrapper --gen-provider-keypair` to crash
|
||||
hardeningDisable = [ "fortify3" ];
|
||||
|
||||
nativeBuildInputs = [ pkg-config autoreconfHook ];
|
||||
buildInputs = [ libsodium libevent ];
|
||||
|
||||
passthru.tests = {
|
||||
inherit (nixosTests) dnscrypt-wrapper;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tool for adding dnscrypt support to any name resolver";
|
||||
homepage = "https://dnscrypt.info/";
|
||||
|
|
|
|||
37
pkgs/tools/text/mw/default.nix
Normal file
37
pkgs/tools/text/mw/default.nix
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, buildNpmPackage
|
||||
}:
|
||||
|
||||
buildNpmPackage rec {
|
||||
pname = "mw";
|
||||
version = "unstable-2023-08-04";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mark-when";
|
||||
repo = "mw";
|
||||
rev = "a8676da1c7812a051456fabcb980c52a72f6e75e";
|
||||
hash = "sha256-i95WuTH8qY+0PYQA9kOykQL+4d4oB2Hlvg9sfGtDeCo=";
|
||||
};
|
||||
|
||||
npmDepsHash = "sha256-D1hTaoM4j81qrrLMoKJ7OxJTfRoht3/yqgJs95EFxY4=";
|
||||
|
||||
# correctly substitute the usage message
|
||||
postPatch = ''
|
||||
substituteInPlace src/index.ts --replace \
|
||||
'.usage("$0' '.usage("mw'
|
||||
'';
|
||||
|
||||
meta = {
|
||||
changelog = "https://github.com/mark-when/mw/blob/${src.rev}/CHANGELOG.md";
|
||||
description = "Markwhen CLI";
|
||||
homepage = "https://github.com/mark-when/mw";
|
||||
license = lib.licenses.mit;
|
||||
longDescription = ''
|
||||
Markwhen is an interactive text-to-timeline tool. Write markdown-ish text and it gets converted into a nice looking cascading timeline.
|
||||
'';
|
||||
mainProgram = "mw";
|
||||
maintainers = with lib.maintainers; [ dit7ya ];
|
||||
};
|
||||
}
|
||||
|
|
@ -5025,9 +5025,9 @@ with pkgs;
|
|||
|
||||
duperemove = callPackage ../tools/filesystems/duperemove { };
|
||||
|
||||
dvc = callPackage ../applications/version-management/dvc { };
|
||||
dvc = with python3.pkgs; toPythonApplication dvc;
|
||||
|
||||
dvc-with-remotes = callPackage ../applications/version-management/dvc {
|
||||
dvc-with-remotes = dvc.override {
|
||||
enableGoogle = true;
|
||||
enableAWS = true;
|
||||
enableAzure = true;
|
||||
|
|
@ -6779,6 +6779,8 @@ with pkgs;
|
|||
|
||||
keyd = callPackage ../tools/inputmethods/keyd { };
|
||||
|
||||
keymapper = callPackage ../tools/inputmethods/keymapper { };
|
||||
|
||||
twitch-tui = callPackage ../applications/networking/instant-messengers/twitch-tui {
|
||||
inherit (darwin.apple_sdk.frameworks) Security;
|
||||
};
|
||||
|
|
@ -11007,6 +11009,13 @@ with pkgs;
|
|||
|
||||
mtm = callPackage ../tools/misc/mtm { };
|
||||
|
||||
op-geth = callPackage ../applications/blockchains/optimism/geth.nix {
|
||||
inherit (darwin) libobjc;
|
||||
inherit (darwin.apple_sdk.frameworks) IOKit;
|
||||
};
|
||||
|
||||
optimism = callPackage ../applications/blockchains/optimism { };
|
||||
|
||||
pa_applet = callPackage ../tools/audio/pa-applet { };
|
||||
|
||||
pandoc-acro = python3Packages.callPackage ../tools/misc/pandoc-acro { };
|
||||
|
|
@ -15002,6 +15011,8 @@ with pkgs;
|
|||
|
||||
zsh-command-time = callPackage ../shells/zsh/zsh-command-time { };
|
||||
|
||||
zsh-fzf-history-search = callPackage ../shells/zsh/zsh-fzf-history-search { };
|
||||
|
||||
zsh-vi-mode = callPackage ../shells/zsh/zsh-vi-mode { };
|
||||
|
||||
zsh-you-should-use = callPackage ../shells/zsh/zsh-you-should-use { };
|
||||
|
|
@ -24955,6 +24966,8 @@ with pkgs;
|
|||
|
||||
sv-lang = callPackage ../applications/science/electronics/sv-lang { };
|
||||
|
||||
sqld = callPackage ../servers/sql/sqld { };
|
||||
|
||||
sqlite = lowPrio (callPackage ../development/libraries/sqlite { });
|
||||
|
||||
unqlite = lowPrio (callPackage ../development/libraries/unqlite { });
|
||||
|
|
@ -33743,6 +33756,8 @@ with pkgs;
|
|||
|
||||
mutt-ics = callPackage ../tools/networking/mutt-ics { };
|
||||
|
||||
mw = callPackage ../tools/text/mw { };
|
||||
|
||||
mwic = callPackage ../applications/misc/mwic {
|
||||
pythonPackages = python3Packages;
|
||||
};
|
||||
|
|
@ -40911,6 +40926,8 @@ with pkgs;
|
|||
|
||||
unityhub = callPackage ../development/tools/unityhub { };
|
||||
|
||||
upspin = callPackage ../tools/filesystems/upspin { };
|
||||
|
||||
urbit = callPackage ../misc/urbit { };
|
||||
|
||||
usb-reset = callPackage ../applications/misc/usb-reset { };
|
||||
|
|
|
|||
|
|
@ -3184,6 +3184,8 @@ self: super: with self; {
|
|||
|
||||
durus = callPackage ../development/python-modules/durus { };
|
||||
|
||||
dvc = callPackage ../development/python-modules/dvc { };
|
||||
|
||||
dvc-azure = callPackage ../development/python-modules/dvc-azure { };
|
||||
|
||||
dvc-data = callPackage ../development/python-modules/dvc-data { };
|
||||
|
|
@ -5321,7 +5323,6 @@ self: super: with self; {
|
|||
# Some platforms don't have `cudaSupport` defined, hence the need for 'or false'.
|
||||
inherit (pkgs.config) cudaSupport;
|
||||
IOKit = pkgs.darwin.apple_sdk_11_0.IOKit;
|
||||
protobuf = pkgs.protobuf3_20; # jaxlib-build 0.3.15 won't build with protobuf 3.21
|
||||
};
|
||||
|
||||
jaxlib = self.jaxlib-build;
|
||||
|
|
@ -6557,6 +6558,7 @@ self: super: with self; {
|
|||
mkdocs-jupyter = callPackage ../development/python-modules/mkdocs-jupyter { };
|
||||
mkdocs-gitlab = callPackage ../development/python-modules/mkdocs-gitlab-plugin { };
|
||||
mkdocs-git-authors-plugin = callPackage ../development/python-modules/mkdocs-git-authors-plugin { };
|
||||
mkdocs-git-revision-date-localized-plugin = callPackage ../development/python-modules/mkdocs-git-revision-date-localized-plugin { };
|
||||
mkdocs-linkcheck = callPackage ../development/python-modules/mkdocs-linkcheck { };
|
||||
mkdocs-macros = callPackage ../development/python-modules/mkdocs-macros { };
|
||||
mkdocs-material = callPackage ../development/python-modules/mkdocs-material { };
|
||||
|
|
@ -6576,6 +6578,8 @@ self: super: with self; {
|
|||
|
||||
ml-collections = callPackage ../development/python-modules/ml-collections { };
|
||||
|
||||
ml-dtypes = callPackage ../development/python-modules/ml-dtypes { };
|
||||
|
||||
mlflow = callPackage ../development/python-modules/mlflow { };
|
||||
|
||||
mlrose = callPackage ../development/python-modules/mlrose { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue