Skip to content

Commit

Permalink
adding some stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
tanneberger committed May 24, 2024
1 parent 6b97db6 commit 1b96922
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 43 deletions.
11 changes: 11 additions & 0 deletions derivation.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{ lib, pkgs, cargoToml, ... }:
let
manifest = (lib.importTOML cargoToml).package;
in
pkgs.rustPlatform.buildRustPackage {
pname = manifest.name;
version = manifest.version;
cargoLock.lockFile = ./Cargo.lock;
src = lib.cleanSource ./.;
cargoBuildFlags = "-p ${manifest.name}";
}
18 changes: 9 additions & 9 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 6 additions & 15 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -22,25 +22,16 @@
latest.rustc
];

migration-package = pkgs.callPackage ./pkgs/migration.nix {
buildPackage = (naersk.lib.${system}.override {
cargo = toolchain;
rustc = toolchain;
}).buildPackage;
migration-package = pkgs.callPackage ./derivation.nix {
cargoToml = ./lib/migration/Cargo.toml;
};

chef = pkgs.callPackage ./pkgs/chef.nix {
buildPackage = (naersk.lib.${system}.override {
cargo = toolchain;
rustc = toolchain;
}).buildPackage;
chef = pkgs.callPackage ./derivation.nix {
cargoToml = ./bin/chef/Cargo.toml;
};

maid = pkgs.callPackage ./pkgs/maid.nix {
buildPackage = (naersk.lib.${system}.override {
cargo = toolchain;
rustc = toolchain;
}).buildPackage;
maid = pkgs.callPackage ./derivation.nix {
cargoToml = ./bin/maid/Cargo.toml;
};
in
{
Expand Down
2 changes: 1 addition & 1 deletion lib/migration/src/m20231010_000001_create_table.rs
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ impl MigrationTrait for Migration {
id uuid not null primary key references record(id),
content text not null
);
-- TODO:
-- create index zone_name_index on zone(name);
-- create index record_name_index on record(name);
Expand Down
2 changes: 1 addition & 1 deletion pkgs/chef.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ buildPackage {

meta = {
description = "";
homepage = "https://github.com/dresden-zone/dns";
homepage = "https://github.com/dresden-zone/rabauken";
};
}
17 changes: 0 additions & 17 deletions pkgs/maid.nix

This file was deleted.

0 comments on commit 1b96922

Please sign in to comment.