Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Dich0tomy/Dire
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6df248c99c51ea18b9b46843f9902d12a3e9e20f
Choose a base ref
..
head repository: Dich0tomy/Dire
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 07a4ce16a1346380d564437349f54037ec6a17bf
Choose a head ref
Showing with 52 additions and 80 deletions.
  1. +1 −1 CHANGELOG.md
  2. +14 −36 flake.lock
  3. +11 −13 flake.nix
  4. +5 −15 nix/dependencies/default.nix
  5. +7 −12 nix/package/default.nix
  6. +14 −3 nix/package/package.nix
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Changelog

## 1.0.0 (2024-05-31)
## 1.0.0 (2024-07-03)


### Features
50 changes: 14 additions & 36 deletions flake.lock

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

24 changes: 11 additions & 13 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -1,25 +1,23 @@
{
description = "Complete cross-platform solution for data and user directories discovery.";

inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
flake-parts.url = "github:hercules-ci/flake-parts";
systems.url = "github:nix-systems/default";
};

outputs = inputs:
inputs.flake-parts.lib.mkFlake {inherit inputs;} {
systems = import inputs.systems;

imports = [
./nix/dependencies
./nix/package
];
systems = ["aarch64-darwin" "aarch64-linux" "x86_64-darwin" "x86_64-linux"];

perSystem = {pkgs, ...}: {
formatter = pkgs.alejandra;

imports = [./nix/shell];
imports = [
./nix/dependencies
./nix/package
./nix/shell
];
};
};

inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
flake-parts.url = "github:hercules-ci/flake-parts";
};
}
20 changes: 5 additions & 15 deletions nix/dependencies/default.nix
Original file line number Diff line number Diff line change
@@ -1,16 +1,6 @@
{inputs, ...}: {
perSystem = {system, ...}: {
_module.args = {
pkgs = import inputs.nixpkgs {
inherit system;

overlays = [
(_: prev: {
tl-optional = prev.callPackage ./tl-optional {};
tl-expected = prev.callPackage ./tl-expected {};
})
];
};
};
};
{pkgs, ...}: {
legacyPackages = {
tl-optional = pkgs.callPackage ./tl-optional {};
tl-expected = pkgs.callPackage ./tl-expected {};
};
}
19 changes: 7 additions & 12 deletions nix/package/default.nix
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
{self, ...}: {
perSystem = {
pkgs,
lib,
...
}: let
version = lib.strings.fileContents "${self}/VERSION";
in {
packages.default = pkgs.callPackage ./package.nix {
inherit self version;
};
};
{
pkgs,
config,
...
}:
{
packages.default = pkgs.callPackage ./package.nix config.legacyPackages;
}
17 changes: 14 additions & 3 deletions nix/package/package.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
{
self,
version,
stdenv,
meson,
ninja,
@@ -9,7 +7,12 @@
tl-optional,
tl-expected,
fmt,
lib,
}:
let
self = ../../.;
version = lib.strings.fileContents "${self}/VERSION";
in
stdenv.mkDerivation {
pname = "dire";
inherit version;
@@ -34,7 +37,15 @@ stdenv.mkDerivation {
tl-expected
];

src = "${self}";
src = lib.fileset.toSource {
root = self;
fileset = lib.fileset.unions [
(self + /src)
(self + /VERSION)
(self + /meson.build)
(self + /meson_options.txt)
];
};

mesonBuildType = "release";