flake update: nixpkgs 2023-02-09 -> 2023-02-15
``` • Updated input 'mobile-nixos': 'github:nixos/mobile-nixos/7478a9ffad737486951186b66f6c5535dc5802e2' (2023-01-28) → 'github:nixos/mobile-nixos/8701fcb1448f1eb67c0d47631ec2bdb613bd6a38' (2023-02-12) • Updated input 'nixpkgs-unpatched': 'github:nixos/nixpkgs/724bfc0892363087709bd3a5a1666296759154b1' (2023-02-09) → 'github:nixos/nixpkgs/28319deb5ab05458d9cd5c7d99e1a24ec2e8fc4b' (2023-02-15) • Updated input 'sops-nix': 'github:Mic92/sops-nix/8fec29b009c19538e68d5d814ec74e04f662fbd1' (2023-02-08) → 'github:Mic92/sops-nix/c5dab21d8706afc7ceb05c23d4244dcb48d6aade' (2023-02-12) • Updated input 'sops-nix/nixpkgs-stable': 'github:NixOS/nixpkgs/e32c33811815ca4a535a16faf1c83eeb4493145b' (2023-02-05) → 'github:NixOS/nixpkgs/d863ca850a06d91365c01620dcac342574ecf46f' (2023-02-12) ```
This commit is contained in:
30
flake.lock
generated
30
flake.lock
generated
@@ -18,11 +18,11 @@
|
|||||||
"mobile-nixos": {
|
"mobile-nixos": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1674880620,
|
"lastModified": 1676240485,
|
||||||
"narHash": "sha256-JMALuC7xcoH/T66sKTVLuItHfOJBCWsNKpE49Qrvs80=",
|
"narHash": "sha256-bef1Zrfpo9cxaf19QhqfTwaagpeoNc08sc8OjYDjSnQ=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "mobile-nixos",
|
"repo": "mobile-nixos",
|
||||||
"rev": "7478a9ffad737486951186b66f6c5535dc5802e2",
|
"rev": "8701fcb1448f1eb67c0d47631ec2bdb613bd6a38",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -39,22 +39,22 @@
|
|||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1,
|
"lastModified": 1,
|
||||||
"narHash": "sha256-FTUAvxSeQToawyfVP9/S2143D5EgCbk88qI2PePLQQ8=",
|
"narHash": "sha256-woP807Ekv3KzkD0bDqC3d1mKtQ4KmEWzF8eK8yqlqKg=",
|
||||||
"path": "/nix/store/s9v0l913m4drrddglbjqa384nxxwhxca-source/nixpatches",
|
"path": "/nix/store/rf5zhzkbvlxkalsnw3dd41dzhi65frh7-source/nixpatches",
|
||||||
"type": "path"
|
"type": "path"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"path": "/nix/store/s9v0l913m4drrddglbjqa384nxxwhxca-source/nixpatches",
|
"path": "/nix/store/rf5zhzkbvlxkalsnw3dd41dzhi65frh7-source/nixpatches",
|
||||||
"type": "path"
|
"type": "path"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1675556398,
|
"lastModified": 1676162277,
|
||||||
"narHash": "sha256-5Gf5KlmFXfIGVQb2hmiiE7FQHoLd4UtEhIolLQvNB/A=",
|
"narHash": "sha256-GK3cnvKNo1l0skGYXXiLJ/TLqdKyIYXd7jOlo0gN+Qw=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "e32c33811815ca4a535a16faf1c83eeb4493145b",
|
"rev": "d863ca850a06d91365c01620dcac342574ecf46f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -66,11 +66,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs-unpatched": {
|
"nixpkgs-unpatched": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1675942811,
|
"lastModified": 1676481215,
|
||||||
"narHash": "sha256-/v4Z9mJmADTpXrdIlAjFa1e+gkpIIROR670UVDQFwIw=",
|
"narHash": "sha256-afma/1RU0EePRyrBPcjBdOt+dV8z1bJH9dtpTN/WXmY=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "724bfc0892363087709bd3a5a1666296759154b1",
|
"rev": "28319deb5ab05458d9cd5c7d99e1a24ec2e8fc4b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -97,11 +97,11 @@
|
|||||||
"nixpkgs-stable": "nixpkgs-stable"
|
"nixpkgs-stable": "nixpkgs-stable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1675872570,
|
"lastModified": 1676171095,
|
||||||
"narHash": "sha256-RPH3CeTv7ixC2WcYiKyhmIgoH/9tur4Kr+3Vg/pleQk=",
|
"narHash": "sha256-2laeSjBAAJ9e/C3uTIPb287iX8qeVLtWiilw1uxqG+A=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "8fec29b009c19538e68d5d814ec74e04f662fbd1",
|
"rev": "c5dab21d8706afc7ceb05c23d4244dcb48d6aade",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@@ -132,7 +132,7 @@ in
|
|||||||
sidebery.package = addon "sidebery" "{3c078156-979c-498b-8990-85f7987dd929}" "sha256-YONfK/rIjlsrTgRHIt3km07Q7KnpIW89Z9r92ZSCc6w=";
|
sidebery.package = addon "sidebery" "{3c078156-979c-498b-8990-85f7987dd929}" "sha256-YONfK/rIjlsrTgRHIt3km07Q7KnpIW89Z9r92ZSCc6w=";
|
||||||
sponsorblock.package = addon "sponsorblock" "sponsorBlocker@ajay.app" "sha256-hRsvLaAsVm3dALsTrJqHTNgRFAQcU7XSaGhr5G6+mFs=";
|
sponsorblock.package = addon "sponsorblock" "sponsorBlocker@ajay.app" "sha256-hRsvLaAsVm3dALsTrJqHTNgRFAQcU7XSaGhr5G6+mFs=";
|
||||||
ublacklist.package = addon "ublacklist" "@ublacklist" "sha256-RqY5iHzbL2qizth7aguyOKWPyINXmrwOlf/OsfqAS48=";
|
ublacklist.package = addon "ublacklist" "@ublacklist" "sha256-RqY5iHzbL2qizth7aguyOKWPyINXmrwOlf/OsfqAS48=";
|
||||||
ublock-origin.package = addon "ublock-origin" "uBlock0@raymondhill.net" "sha256-a/ivUmY1P6teq9x0dt4CbgHt+3kBsEMMXlOfZ5Hx7cg=";
|
ublock-origin.package = addon "ublock-origin" "uBlock0@raymondhill.net" "sha256-52lYqMjrS3GVTaybDrH1p6VF90YVkifguCGxobI/fNQ=";
|
||||||
|
|
||||||
browserpass-extension.enable = lib.mkDefault true;
|
browserpass-extension.enable = lib.mkDefault true;
|
||||||
# bypass-paywalls-clean.enable = lib.mkDefault true;
|
# bypass-paywalls-clean.enable = lib.mkDefault true;
|
||||||
|
@@ -1,78 +0,0 @@
|
|||||||
diff --git a/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch b/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch
|
|
||||||
index 1d9ca8d838d..d2cf9dd4315 100644
|
|
||||||
--- a/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch
|
|
||||||
+++ b/pkgs/applications/networking/instant-messengers/signald/0001-Fetch-buildconfig-during-gradle-build-inside-Nix-FOD.patch
|
|
||||||
@@ -11,25 +11,15 @@ diff --git a/build.gradle b/build.gradle
|
|
||||||
index 799e782..caceaac 100644
|
|
||||||
--- a/build.gradle
|
|
||||||
+++ b/build.gradle
|
|
||||||
-@@ -83,6 +83,9 @@ static String getVersion() {
|
|
||||||
-
|
|
||||||
- repositories {
|
|
||||||
- maven {url "https://gitlab.com/api/v4/groups/6853927/-/packages/maven"} // https://gitlab.com/groups/signald/-/packages
|
|
||||||
-+ maven {
|
|
||||||
-+ url "https://plugins.gradle.org/m2/"
|
|
||||||
-+ }
|
|
||||||
- mavenCentral()
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
-@@ -104,6 +107,8 @@ dependencies {
|
|
||||||
- implementation 'io.prometheus:simpleclient_httpserver:0.16.0'
|
|
||||||
- implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
|
|
||||||
- implementation 'io.sentry:sentry:6.4.0'
|
|
||||||
-+ implementation 'com.github.gmazzo.buildconfig:com.github.gmazzo.buildconfig.gradle.plugin:3.1.0'
|
|
||||||
-+ implementation 'org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10'
|
|
||||||
- testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
|
|
||||||
+@@ -87,7 +86,7 @@ repositories {
|
|
||||||
}
|
|
||||||
|
|
||||||
+ dependencies {
|
|
||||||
+- implementation 'org.signald:signal-service-java-' + getTarget() + ':2.15.3_unofficial_50_signald_1'
|
|
||||||
++ implementation 'org.signald:signal-service-java-' + getTarget() + ':2.15.3_unofficial_50_signald_2'
|
|
||||||
+ implementation 'org.bouncycastle:bcprov-jdk15on:1.70'
|
|
||||||
+ implementation 'com.kohlschutter.junixsocket:junixsocket-common:2.6.1'
|
|
||||||
+ implementation 'com.kohlschutter.junixsocket:junixsocket-native-common:2.6.1'
|
|
||||||
@@ -171,4 +176,4 @@ allprojects {
|
|
||||||
runtime {
|
|
||||||
options = ['--strip-java-debug-attributes', '--compress', '2', '--no-header-files', '--no-man-pages']
|
|
||||||
diff --git a/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch b/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch
|
|
||||||
index 96a7d6d2ef3..2f0f6e73159 100644
|
|
||||||
--- a/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch
|
|
||||||
+++ b/pkgs/applications/networking/instant-messengers/signald/0002-buildconfig-local-deps-fixes.patch
|
|
||||||
@@ -47,15 +47,15 @@ index 799e782..6ecef3e 100644
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
-@@ -104,6 +117,8 @@ dependencies {
|
|
||||||
- implementation 'io.prometheus:simpleclient_httpserver:0.16.0'
|
|
||||||
- implementation 'com.squareup.okhttp3:logging-interceptor:4.9.3'
|
|
||||||
- implementation 'io.sentry:sentry:6.4.0'
|
|
||||||
-+ implementation 'com.github.gmazzo.buildconfig:com.github.gmazzo.buildconfig.gradle.plugin:3.1.0'
|
|
||||||
-+ implementation 'org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10'
|
|
||||||
- testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
|
|
||||||
+@@ -87,7 +86,7 @@ repositories {
|
|
||||||
}
|
|
||||||
|
|
||||||
+ dependencies {
|
|
||||||
+- implementation 'org.signald:signal-service-java-' + getTarget() + ':2.15.3_unofficial_50_signald_1'
|
|
||||||
++ implementation 'org.signald:signal-service-java-' + getTarget() + ':2.15.3_unofficial_50_signald_2'
|
|
||||||
+ implementation 'org.bouncycastle:bcprov-jdk15on:1.70'
|
|
||||||
+ implementation 'com.kohlschutter.junixsocket:junixsocket-common:2.6.1'
|
|
||||||
+ implementation 'com.kohlschutter.junixsocket:junixsocket-native-common:2.6.1'
|
|
||||||
@@ -167,8 +182,3 @@ allprojects {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
diff --git a/pkgs/applications/networking/instant-messengers/signald/default.nix b/pkgs/applications/networking/instant-messengers/signald/default.nix
|
|
||||||
index a9e023cdf63..8847707e137 100644
|
|
||||||
--- a/pkgs/applications/networking/instant-messengers/signald/default.nix
|
|
||||||
+++ b/pkgs/applications/networking/instant-messengers/signald/default.nix
|
|
||||||
@@ -54,8 +54,8 @@ let
|
|
||||||
outputHashMode = "recursive";
|
|
||||||
# Downloaded jars differ by platform
|
|
||||||
outputHash = {
|
|
||||||
- x86_64-linux = "sha256-ANiNDdTuCuDEH5zUPsrVF6Uegdq3zVsMv+uMtYRX0jE=";
|
|
||||||
- aarch64-linux = "sha256-V9zn4v/ZeLELAwFJ5y7OVAeJwZp4DmHm4KWxE6KpwGs=";
|
|
||||||
+ x86_64-linux = "sha256-B2T8bM8xdob5507oS1CVO+sszEg9VWL8QKUEanIlXvk=";
|
|
||||||
+ aarch64-linux = "sha256-I314eLUQP8HPbwc+10ZDKzcn9WsqLGuBtfoiCEYZRck=";
|
|
||||||
}.${stdenv.system} or (throw "Unsupported platform");
|
|
||||||
};
|
|
@@ -23,10 +23,6 @@
|
|||||||
|
|
||||||
./2022-12-19-i2p-aarch64.patch
|
./2022-12-19-i2p-aarch64.patch
|
||||||
|
|
||||||
# fix for <https://gitlab.com/signald/signald/-/issues/345>
|
|
||||||
# allows to actually run signald
|
|
||||||
./2023-01-25-signald-update.patch
|
|
||||||
|
|
||||||
# # kaiteki: init at 2022-09-03
|
# # kaiteki: init at 2022-09-03
|
||||||
# vendorHash changes too frequently (might not be reproducible).
|
# vendorHash changes too frequently (might not be reproducible).
|
||||||
# using local package defn until stabilized
|
# using local package defn until stabilized
|
||||||
|
Reference in New Issue
Block a user