Compare commits
4 Commits
e026e133ed
...
e08e916cbc
Author | SHA1 | Date | |
---|---|---|---|
e08e916cbc | |||
444e7048f9 | |||
a6058ced54 | |||
9d4e81fffc |
@ -357,7 +357,7 @@
|
|||||||
# (extraS|s)pecialArgs to pass variables
|
# (extraS|s)pecialArgs to pass variables
|
||||||
nixosModules = (import ./modules/nixos) moduleInputs;
|
nixosModules = (import ./modules/nixos) moduleInputs;
|
||||||
homeManagerModules = (import ./modules/home-manager) moduleInputs;
|
homeManagerModules = (import ./modules/home-manager) moduleInputs;
|
||||||
packages = eachSystem (system: let pkgs = import nixpkgs { inherit system; };
|
packages = eachSystem (system: let pkgs = import nixpkgs-unstable { inherit system; };
|
||||||
in (
|
in (
|
||||||
import ./pkgs { inherit pkgs; }) // {
|
import ./pkgs { inherit pkgs; }) // {
|
||||||
iso = let
|
iso = let
|
||||||
|
@ -5,26 +5,39 @@
|
|||||||
, rustPlatform
|
, rustPlatform
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, darwin
|
, darwin
|
||||||
|
, pkg-config
|
||||||
|
, perl
|
||||||
|
, openssl
|
||||||
, nix-update-script
|
, nix-update-script
|
||||||
}:
|
}:
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "redlib";
|
pname = "redlib";
|
||||||
version = "0.35.1-unstable-2024-11-15";
|
version = "0.35.1-unstable-2024-11-19";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "redlib-org";
|
owner = "redlib-org";
|
||||||
repo = "redlib";
|
repo = "redlib";
|
||||||
rev = "6c64ebd56b98f5616c2014e2e0567fa37791844c";
|
rev = "18efb8c714ad10e0082059e1d47e0f95686d04a7";
|
||||||
hash = "sha256-QXcjpIO1y6mi+4E2BC6O16TaLFfpcPcCHumuJBXmcoU=";
|
hash = "sha256-Kzh0nSGxSqr4c6EvshqHdvqYbqiKCRehf2ngAuj2fmw=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
# this is so the commit hash can be embedded so redlib doesn't complain
|
||||||
|
# about the server being outdated unless it's /actually/ outdated
|
||||||
|
./no-hash.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
cargoHash = "sha256-tb+qTANios+dvNK775gqy0AmB5fuj5BhfYYYegnraEg=";
|
cargoHash = "sha256-ZmIYTDfdMDkxT1doV5kMMjqIHQ/zhiY/ewd77RqRSMU=";
|
||||||
|
|
||||||
buildInputs = lib.optionals stdenv.isDarwin [
|
buildInputs = lib.optionals stdenv.isDarwin [
|
||||||
darwin.apple_sdk.frameworks.Security
|
darwin.apple_sdk.frameworks.Security
|
||||||
|
] ++ lib.optionals stdenv.isLinux [
|
||||||
|
openssl
|
||||||
|
];
|
||||||
|
|
||||||
|
nativeBuildInputs = lib.optionals stdenv.isLinux [
|
||||||
|
pkg-config
|
||||||
|
perl
|
||||||
];
|
];
|
||||||
|
|
||||||
checkFlags = [
|
checkFlags = [
|
||||||
@ -53,6 +66,7 @@ rustPlatform.buildRustPackage rec {
|
|||||||
|
|
||||||
env = {
|
env = {
|
||||||
SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
|
SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
|
||||||
|
GIT_HASH=src.rev;
|
||||||
};
|
};
|
||||||
|
|
||||||
passthru.tests = {
|
passthru.tests = {
|
||||||
|
10
pkgs/redlib/no-hash.patch
Normal file
10
pkgs/redlib/no-hash.patch
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
diff --git a/build.rs b/build.rs
|
||||||
|
index 0bdbda0..869c7e6 100644
|
||||||
|
--- a/build.rs
|
||||||
|
+++ b/build.rs
|
||||||
|
@@ -21,5 +21,4 @@ fn main() {
|
||||||
|
)
|
||||||
|
.unwrap_or_default();
|
||||||
|
let git_hash = if output == String::default() { "dev".into() } else { output };
|
||||||
|
- println!("cargo:rustc-env=GIT_HASH={git_hash}");
|
||||||
|
}
|
18
update.sh
18
update.sh
@ -3,8 +3,24 @@
|
|||||||
|
|
||||||
set -Eeuxo pipefail
|
set -Eeuxo pipefail
|
||||||
|
|
||||||
|
if [[ "$#" -ne 0 ]] ; then
|
||||||
|
until [[ "$#" -le 0 ]]; do
|
||||||
|
case "$1" in
|
||||||
|
pkgs|packages) DO_PACKAGES=1;;
|
||||||
|
flake) DO_FLAKE=1;;
|
||||||
|
esac
|
||||||
|
shift
|
||||||
|
done
|
||||||
|
else
|
||||||
|
DO_PACKAGES=1
|
||||||
|
DO_FLAKE=1
|
||||||
|
fi
|
||||||
|
|
||||||
cd "$(dirname "$0")"
|
cd "$(dirname "$0")"
|
||||||
|
|
||||||
nix flake update
|
|
||||||
|
|
||||||
|
[[ -n "${DO_FLAKE:+x}" ]] && nix flake update || true
|
||||||
|
|
||||||
|
if [[ -n "${DO_PACKAGES:+x}" ]] ; then
|
||||||
nix-update --flake redlib --version=branch=main
|
nix-update --flake redlib --version=branch=main
|
||||||
|
fi
|
||||||
|
Loading…
x
Reference in New Issue
Block a user