Compare commits
No commits in common. "8bb9be9ffffc0b1384ad0abe8824f120b0186a8d" and "c1f1b430bff63cb5e3671d0dff958271449498d8" have entirely different histories.
8bb9be9fff
...
c1f1b430bf
|
|
@ -0,0 +1,140 @@
|
||||||
|
From 095afd88c41f08cb37e9cd67429baaa8d02e2d6f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
|
||||||
|
Date: Tue, 4 Jul 2023 02:07:17 +0200
|
||||||
|
Subject: [PATCH] pagefind: init at 1.0.2
|
||||||
|
|
||||||
|
---
|
||||||
|
pkgs/applications/misc/pagefind/default.nix | 110 ++++++++++++++++++++
|
||||||
|
pkgs/top-level/all-packages.nix | 2 +
|
||||||
|
2 files changed, 112 insertions(+)
|
||||||
|
create mode 100644 pkgs/applications/misc/pagefind/default.nix
|
||||||
|
|
||||||
|
diff --git a/pkgs/applications/misc/pagefind/default.nix b/pkgs/applications/misc/pagefind/default.nix
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000000000..02bbd2e95e9b9
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/pkgs/applications/misc/pagefind/default.nix
|
||||||
|
@@ -0,0 +1,110 @@
|
||||||
|
+{ lib
|
||||||
|
+, callPackage
|
||||||
|
+, rustPlatform
|
||||||
|
+, fetchFromGitHub
|
||||||
|
+, fetchNpmDeps
|
||||||
|
+, npmHooks
|
||||||
|
+, binaryen
|
||||||
|
+, gzip
|
||||||
|
+, nodejs
|
||||||
|
+, rustc-wasm32
|
||||||
|
+, wasm-bindgen-cli
|
||||||
|
+, wasm-pack
|
||||||
|
+}:
|
||||||
|
+
|
||||||
|
+let
|
||||||
|
+
|
||||||
|
+ wasm-bindgen-84 = wasm-bindgen-cli.override {
|
||||||
|
+ version = "0.2.84";
|
||||||
|
+ hash = "sha256-0rK+Yx4/Jy44Fw5VwJ3tG243ZsyOIBBehYU54XP/JGk=";
|
||||||
|
+ cargoHash = "sha256-vcpxcRlW1OKoD64owFF6mkxSqmNrvY+y3Ckn5UwEQ50=";
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+in
|
||||||
|
+
|
||||||
|
+rustPlatform.buildRustPackage rec {
|
||||||
|
+ pname = "pagefind";
|
||||||
|
+ version = "1.0.2";
|
||||||
|
+
|
||||||
|
+ src = fetchFromGitHub {
|
||||||
|
+ owner = "cloudcannon";
|
||||||
|
+ repo = "pagefind";
|
||||||
|
+ rev = "refs/tags/v${version}";
|
||||||
|
+ hash = "sha256-hTEDTl9cjIwMkSzH0coRQwx9cXfx9W/dYLNV2ES+qA0=";
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ cargoHash = "sha256-J6gU4kT8callfy+4ecHPPAdMtj4xZ6qP1dNxaPzJNuc=";
|
||||||
|
+
|
||||||
|
+ env.npmDeps_web_js = fetchNpmDeps {
|
||||||
|
+ name = "npm-deps-web-js";
|
||||||
|
+ src = "${src}/pagefind_web_js";
|
||||||
|
+ hash = "sha256-pGE4lUFZ4dA++8kBklcMBoaN/1Z92dfOzQKhukbuEyc=";
|
||||||
|
+ };
|
||||||
|
+ env.npmDeps_ui_default = fetchNpmDeps {
|
||||||
|
+ name = "npm-deps-ui-default";
|
||||||
|
+ src = "${src}/pagefind_ui/default";
|
||||||
|
+ hash = "sha256-voCs49JneWYE1W9U7aB6G13ypH6JqathVDeF58V57U8=";
|
||||||
|
+ };
|
||||||
|
+ env.npmDeps_ui_modular = fetchNpmDeps {
|
||||||
|
+ name = "npm-deps-ui-modular";
|
||||||
|
+ src = "${src}/pagefind_ui/modular";
|
||||||
|
+ hash = "sha256-O0RqZUsRFtByxMQdwNGNcN38Rh+sDqqNo9YlBcrnsF4=";
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ postPatch = ''
|
||||||
|
+ # Tricky way to run npmConfigHook multiple times
|
||||||
|
+ (
|
||||||
|
+ local postPatchHooks=() # written to by npmConfigHook
|
||||||
|
+ source ${npmHooks.npmConfigHook}/nix-support/setup-hook
|
||||||
|
+ npmRoot=pagefind_web_js npmDeps=$npmDeps_web_js npmConfigHook
|
||||||
|
+ npmRoot=pagefind_ui/default npmDeps=$npmDeps_ui_default npmConfigHook
|
||||||
|
+ npmRoot=pagefind_ui/modular npmDeps=$npmDeps_ui_modular npmConfigHook
|
||||||
|
+ )
|
||||||
|
+ '';
|
||||||
|
+
|
||||||
|
+ nativeBuildInputs = [
|
||||||
|
+ binaryen
|
||||||
|
+ gzip
|
||||||
|
+ nodejs
|
||||||
|
+ rustc-wasm32
|
||||||
|
+ rustc-wasm32.llvmPackages.lld
|
||||||
|
+ wasm-bindgen-84
|
||||||
|
+ wasm-pack
|
||||||
|
+ ];
|
||||||
|
+
|
||||||
|
+ # build wasm and js assets
|
||||||
|
+ # based on "test-and-build" in https://github.com/CloudCannon/pagefind/blob/main/.github/workflows/release.yml
|
||||||
|
+ preBuild = ''
|
||||||
|
+ (
|
||||||
|
+ cd pagefind_web_js
|
||||||
|
+ npm run build-coupled
|
||||||
|
+ )
|
||||||
|
+
|
||||||
|
+ (
|
||||||
|
+ cd pagefind_web
|
||||||
|
+ export HOME=$(mktemp -d)
|
||||||
|
+ export RUSTFLAGS="-C linker=lld"
|
||||||
|
+ bash ./local_build.sh
|
||||||
|
+ )
|
||||||
|
+
|
||||||
|
+ (
|
||||||
|
+ cd pagefind_ui/default
|
||||||
|
+ npm run build
|
||||||
|
+ )
|
||||||
|
+
|
||||||
|
+ (
|
||||||
|
+ cd pagefind_ui/modular
|
||||||
|
+ npm run build
|
||||||
|
+ )
|
||||||
|
+ '';
|
||||||
|
+
|
||||||
|
+ buildFeatures = [ "extended" ];
|
||||||
|
+
|
||||||
|
+ meta = with lib; {
|
||||||
|
+ description = "Generate low-bandwidth search index for your static website";
|
||||||
|
+ homepage = "https://pagefind.app/";
|
||||||
|
+ license = licenses.mit;
|
||||||
|
+ maintainers = with maintainers; [ pbsds ];
|
||||||
|
+ platforms = platforms.unix;
|
||||||
|
+ };
|
||||||
|
+}
|
||||||
|
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
|
||||||
|
index 8e9cddabc6fa3..bf3d6fec5ab2a 100644
|
||||||
|
--- a/pkgs/top-level/all-packages.nix
|
||||||
|
+++ b/pkgs/top-level/all-packages.nix
|
||||||
|
@@ -11534,6 +11534,8 @@ with pkgs;
|
||||||
|
|
||||||
|
PageEdit = libsForQt5.callPackage ../applications/office/PageEdit { };
|
||||||
|
|
||||||
|
+ pagefind = libsForQt5.callPackage ../applications/misc/pagefind { };
|
||||||
|
+
|
||||||
|
paging-calculator = callPackage ../development/tools/paging-calculator { };
|
||||||
|
|
||||||
|
pagmo2 = callPackage ../development/libraries/pagmo2 { };
|
||||||
|
|
@ -0,0 +1,77 @@
|
||||||
|
From b6910512a0789390af9db312ee8f08665bd662ab Mon Sep 17 00:00:00 2001
|
||||||
|
From: Joe Neeman <joeneeman@gmail.com>
|
||||||
|
Date: Mon, 15 May 2023 12:36:46 -0500
|
||||||
|
Subject: [PATCH] wasm-bindgen-cli: 0.2.84 -> 0.2.87
|
||||||
|
|
||||||
|
Also allow overriding the version
|
||||||
|
---
|
||||||
|
.../tools/wasm-bindgen-cli/default.nix | 15 +++++++--------
|
||||||
|
pkgs/servers/ldap/lldap/default.nix | 8 +++++++-
|
||||||
|
2 files changed, 14 insertions(+), 9 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix
|
||||||
|
index ec336d422ab162..d7b6aba2a2a3a5 100644
|
||||||
|
--- a/pkgs/development/tools/wasm-bindgen-cli/default.nix
|
||||||
|
+++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix
|
||||||
|
@@ -7,28 +7,27 @@
|
||||||
|
, stdenv
|
||||||
|
, curl
|
||||||
|
, Security
|
||||||
|
-, runCommand
|
||||||
|
+, version ? "0.2.87"
|
||||||
|
+, hash ? "sha256-0u9bl+FkXEK2b54n7/l9JOCtKo+pb42GF9E1EnAUQa0="
|
||||||
|
+, cargoHash ? "sha256-AsZBtE2qHJqQtuCt/wCAgOoxYMfvDh8IzBPAOkYSYko="
|
||||||
|
}:
|
||||||
|
|
||||||
|
rustPlatform.buildRustPackage rec {
|
||||||
|
pname = "wasm-bindgen-cli";
|
||||||
|
- version = "0.2.84";
|
||||||
|
+ inherit version hash cargoHash;
|
||||||
|
|
||||||
|
src = fetchCrate {
|
||||||
|
- inherit pname version;
|
||||||
|
- sha256 = "sha256-0rK+Yx4/Jy44Fw5VwJ3tG243ZsyOIBBehYU54XP/JGk=";
|
||||||
|
+ inherit pname version hash;
|
||||||
|
};
|
||||||
|
|
||||||
|
- cargoSha256 = "sha256-vcpxcRlW1OKoD64owFF6mkxSqmNrvY+y3Ckn5UwEQ50=";
|
||||||
|
-
|
||||||
|
nativeBuildInputs = [ pkg-config ];
|
||||||
|
|
||||||
|
buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl Security ];
|
||||||
|
|
||||||
|
nativeCheckInputs = [ nodejs ];
|
||||||
|
|
||||||
|
- # other tests require it to be ran in the wasm-bindgen monorepo
|
||||||
|
- cargoTestFlags = [ "--test=interface-types" ];
|
||||||
|
+ # tests require it to be ran in the wasm-bindgen monorepo
|
||||||
|
+ doCheck = false;
|
||||||
|
|
||||||
|
meta = with lib; {
|
||||||
|
homepage = "https://rustwasm.github.io/docs/wasm-bindgen/";
|
||||||
|
diff --git a/pkgs/servers/ldap/lldap/default.nix b/pkgs/servers/ldap/lldap/default.nix
|
||||||
|
index 1948ca015dda83..93bf09add84905 100644
|
||||||
|
--- a/pkgs/servers/ldap/lldap/default.nix
|
||||||
|
+++ b/pkgs/servers/ldap/lldap/default.nix
|
||||||
|
@@ -32,6 +32,12 @@ let
|
||||||
|
configureFlags = attrs.configureFlags ++ ["--set=build.docs=false"];
|
||||||
|
});
|
||||||
|
|
||||||
|
+ wasm-bindgen-84 = wasm-bindgen-cli.override {
|
||||||
|
+ version = "0.2.84";
|
||||||
|
+ hash = "sha256-0rK+Yx4/Jy44Fw5VwJ3tG243ZsyOIBBehYU54XP/JGk=";
|
||||||
|
+ cargoHash = "sha256-vcpxcRlW1OKoD64owFF6mkxSqmNrvY+y3Ckn5UwEQ50=";
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
commonDerivationAttrs = rec {
|
||||||
|
pname = "lldap";
|
||||||
|
version = "0.4.3";
|
||||||
|
@@ -65,7 +71,7 @@ let
|
||||||
|
pname = commonDerivationAttrs.pname + "-frontend";
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
- wasm-pack wasm-bindgen-cli binaryen which rustc-wasm rustc-wasm.llvmPackages.lld
|
||||||
|
+ wasm-pack wasm-bindgen-84 binaryen which rustc-wasm rustc-wasm.llvmPackages.lld
|
||||||
|
];
|
||||||
|
|
||||||
|
buildPhase = ''
|
||||||
|
|
@ -0,0 +1,82 @@
|
||||||
|
From f23952856444fe39fad622a0db9eae55cd0f6fe8 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
|
||||||
|
Date: Mon, 7 Aug 2023 19:00:05 +0200
|
||||||
|
Subject: [PATCH] rustc-wasm32: init at 1.70.0
|
||||||
|
|
||||||
|
---
|
||||||
|
pkgs/servers/ldap/lldap/default.nix | 20 ++------------------
|
||||||
|
pkgs/top-level/all-packages.nix | 16 ++++++++++++++++
|
||||||
|
2 files changed, 18 insertions(+), 18 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/pkgs/servers/ldap/lldap/default.nix b/pkgs/servers/ldap/lldap/default.nix
|
||||||
|
index 44678a71db1ea..3527f33f060dc 100644
|
||||||
|
--- a/pkgs/servers/ldap/lldap/default.nix
|
||||||
|
+++ b/pkgs/servers/ldap/lldap/default.nix
|
||||||
|
@@ -7,6 +7,7 @@
|
||||||
|
, nixosTests
|
||||||
|
, rustPlatform
|
||||||
|
, rustc
|
||||||
|
+, rustc-wasm32
|
||||||
|
, stdenv
|
||||||
|
, wasm-bindgen-cli
|
||||||
|
, wasm-pack
|
||||||
|
@@ -15,23 +16,6 @@
|
||||||
|
|
||||||
|
let
|
||||||
|
|
||||||
|
- # replace with upstream wasm rustc, after resolution of
|
||||||
|
- # https://github.com/NixOS/nixpkgs/issues/89426
|
||||||
|
- rustc-wasm = (rustc.override {
|
||||||
|
- stdenv = stdenv.override {
|
||||||
|
- targetPlatform = stdenv.targetPlatform // {
|
||||||
|
- parsed = {
|
||||||
|
- cpu.name = "wasm32";
|
||||||
|
- vendor.name = "unknown";
|
||||||
|
- kernel.name = "unknown";
|
||||||
|
- abi.name = "unknown";
|
||||||
|
- };
|
||||||
|
- };
|
||||||
|
- };
|
||||||
|
- }).overrideAttrs (attrs: {
|
||||||
|
- configureFlags = attrs.configureFlags ++ ["--set=build.docs=false"];
|
||||||
|
- });
|
||||||
|
-
|
||||||
|
wasm-bindgen-84 = wasm-bindgen-cli.override {
|
||||||
|
version = "0.2.84";
|
||||||
|
hash = "sha256-0rK+Yx4/Jy44Fw5VwJ3tG243ZsyOIBBehYU54XP/JGk=";
|
||||||
|
@@ -71,7 +55,7 @@ let
|
||||||
|
pname = commonDerivationAttrs.pname + "-frontend";
|
||||||
|
|
||||||
|
nativeBuildInputs = [
|
||||||
|
- wasm-pack wasm-bindgen-84 binaryen which rustc-wasm rustc-wasm.llvmPackages.lld
|
||||||
|
+ wasm-pack wasm-bindgen-84 binaryen which rustc-wasm32 rustc-wasm32.llvmPackages.lld
|
||||||
|
];
|
||||||
|
|
||||||
|
buildPhase = ''
|
||||||
|
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
|
||||||
|
index b9bb66eb682fa..8e9cddabc6fa3 100644
|
||||||
|
--- a/pkgs/top-level/all-packages.nix
|
||||||
|
+++ b/pkgs/top-level/all-packages.nix
|
||||||
|
@@ -16864,6 +16864,22 @@ with pkgs;
|
||||||
|
|
||||||
|
inherit (rustPackages) cargo cargo-auditable cargo-auditable-cargo-wrapper clippy rustc rustPlatform;
|
||||||
|
|
||||||
|
+ # https://github.com/NixOS/nixpkgs/issues/89426
|
||||||
|
+ rustc-wasm32 = (rustc.override {
|
||||||
|
+ stdenv = stdenv.override {
|
||||||
|
+ targetPlatform = stdenv.targetPlatform // {
|
||||||
|
+ parsed = {
|
||||||
|
+ cpu.name = "wasm32";
|
||||||
|
+ vendor.name = "unknown";
|
||||||
|
+ kernel.name = "unknown";
|
||||||
|
+ abi.name = "unknown";
|
||||||
|
+ };
|
||||||
|
+ };
|
||||||
|
+ };
|
||||||
|
+ }).overrideAttrs (old: {
|
||||||
|
+ configureFlags = old.configureFlags ++ ["--set=build.docs=false"];
|
||||||
|
+ });
|
||||||
|
+
|
||||||
|
makeRustPlatform = callPackage ../development/compilers/rust/make-rust-platform.nix { };
|
||||||
|
|
||||||
|
buildRustCrate = callPackage ../build-support/rust/build-rust-crate { };
|
||||||
|
|
@ -1,34 +0,0 @@
|
||||||
---
|
|
||||||
title: Papal bull of excommuncation to Patriarch of Constantinople Michael Cerularius in 1054
|
|
||||||
date: 1054
|
|
||||||
author: Cardinal Humbert
|
|
||||||
source: http://ercf.blogspot.com/2011/05/papal-bull-of-excommunication-to.html
|
|
||||||
comment: The source has "Let them be anathema Maranatha", which in context seems like an accidental word insertion. I would like to find a more primary source.
|
|
||||||
---
|
|
||||||
|
|
||||||
Humbert, cardinal bishop of the holy Roman Church by the grace of God; Peter, archbishop of Amalfi; and Frederick, deacon and chancellor, to all the children of the catholic Church.
|
|
||||||
|
|
||||||
The holy, primary, and apostolic see of Rome, to which the care of all the churches most especially pertains as if to a head, deigned to make us its ambassadors to this royal city for the sake of the peace and utility of the Church so that, in accordance with what has been written, we might descend and see whether the complaint which rises to its ears without ceasing from this great city, is realized in fact or to know if it is not like this.
|
|
||||||
|
|
||||||
Let the glorious emperors, clergy, senate, and people of this city of Constantinople as well as the entire catholic Church therefore know that we have sensed here both a great good, whence we greatly rejoice in the Lord, and the greatest evil, whence we lament in misery. For as far as the columns of the imperial power and its honored and wise citizens go, this city is most Christian and orthodox.
|
|
||||||
|
|
||||||
But as far as Michael, who is called patriarch through an abuse of the term, and the backers of his foolishness are concerned, innumerable tares of heresies are daily sown in its midst.
|
|
||||||
|
|
||||||
Because like Simoniacs, they sell the gift of God;
|
|
||||||
Like Valesians, they castrate their guests and promote them not only to the clergy but to the episcopacy;
|
|
||||||
Like Arians, they rebaptize those already baptized in the name of the Holy Trinity, and especially Latins;
|
|
||||||
Like Donatists, they claim that with the exception of the Greek Church, the Church of Christ and baptism has perished from the world;
|
|
||||||
Like Nicolaitists, they allow and defend the carnal marriages of the ministers of the sacred altar;
|
|
||||||
Like Severians, they say that the law of Moses is accursed;
|
|
||||||
Like Pneumatomachoi or Theomachoi, they cut off the procession of the Holy Spirit from the Son;
|
|
||||||
Like the Manichaeans among others, they state that leave is ensouled (animatum);
|
|
||||||
Like the Nazarenes, they preserve the carnal cleanness of the Jews to such an extent that they refuse to baptize dying babies before eight days after birth and, in refusing to communicate with pregnant or menstruating women, they forbid them to be baptized if they are pagan;
|
|
||||||
And because they grow the hair on their head and beards, they will not receive in communion those who tonsure their hair and shave their beards following the decreed practice of the Roman Church.
|
|
||||||
|
|
||||||
For these errors and many others committed by them, Michael himself, although admonished by the letters of our lord Pope Leo, contemptuously refused to repent.
|
|
||||||
|
|
||||||
Furthermore, when we, the Pope's ambassadors, wanted to eliminate the causes of such great evils in a reasonable way, he denied us his presence and conversation, forbid churches to celebrate Mass, just as he had earlier closed the churches of the Latins and, calling them "azymites," had persecuted the Latins everywhere in word and deed. Indeed, so much [did he persecute them] that among his own children, he had anathematized the apostolic see and against it he still writes that he is the ecumenical patriarch.
|
|
||||||
|
|
||||||
Therefore, because we did not tolerate this unheard of outrage and injury of the first, holy, and apostolic see and were concerned that the catholic faith would be undermined in many ways, by the authority of the holy and individuated Trinity and the apostolic see, whose embassy we are performing, and of all the orthodox fathers from the seven councils and of the entire catholic Church, we thus subscribe to the following anathema which the most reverend pope has proclaimed upon Michael and his followers unless they should repent.
|
|
||||||
|
|
||||||
Michael, neophyte patriarch through abuse of office, who took on the monastic habit out of fear of men alone and is now accused by many of the worst of crimes; and with him Leo called bishop of Achrida; Constantine, chaplain of this Michael, who trampled the sacrifice of the Latins with profane feet; and all their followers in the aforementioned errors and acts of presumption: Let them be anathema with the Simoniacs, Valesians, Arians, Donatists, Nicolaitists, Severians, Pneumatomachoi, Manichaeans, Nazarenes, and all the heretics — nay, with the devil himself and his angels, unless they should repent. AMEN, AMEN, AMEN.
|
|
||||||
|
|
@ -13,10 +13,6 @@ I have made only such edits as are necessary for the sake of presentation
|
||||||
(i.e. formatting the source text into Markdown or adding hyperlinks).
|
(i.e. formatting the source text into Markdown or adding hyperlinks).
|
||||||
Any errors are my own.
|
Any errors are my own.
|
||||||
|
|
||||||
## 11th century
|
|
||||||
|
|
||||||
* Cardinal Humbert — [Bull of excommunication](./humbert-1054-excommunication.md)
|
|
||||||
|
|
||||||
## 13th century
|
## 13th century
|
||||||
|
|
||||||
* Second Council of Lyons — [First Constitution](./lyons2-1274.md)
|
* Second Council of Lyons — [First Constitution](./lyons2-1274.md)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue