Skip to content

Commit

Permalink
Nix housekeeping
Browse files Browse the repository at this point in the history
  • Loading branch information
stellar-novas committed Dec 10, 2024
1 parent 49b9c34 commit bc18365
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 25 deletions.
6 changes: 3 additions & 3 deletions .envrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
if ! has nix_direnv_version || ! nix_direnv_version 3.0.4; then
source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.4/direnvrc" "sha256-DzlYZ33mWF/Gs8DDeyjr8mnVmQGx7ASYqA5WlxwvBG4="
if ! has nix_direnv_version || ! nix_direnv_version 3.0.6; then
source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.6/direnvrc" "sha256-RYcUJaRMf8oF5LznDrlCXbkOQrywm0HDv1VjYGaJGdM="
fi
use flake
use nix
14 changes: 7 additions & 7 deletions flake.lock

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

23 changes: 16 additions & 7 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -1,13 +1,22 @@
{
description = "Development environment for Space Station 14";

inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-24.05";
inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-24.11";
inputs.flake-utils.url = "github:numtide/flake-utils";

outputs = { self, nixpkgs, flake-utils }:
flake-utils.lib.eachDefaultSystem (system: let
pkgs = nixpkgs.legacyPackages.${system};
in {
devShells.default = import ./shell.nix { inherit pkgs; };
});
outputs =
{
self,
nixpkgs,
flake-utils,
}:
flake-utils.lib.eachDefaultSystem (
system:
let
pkgs = nixpkgs.legacyPackages.${system};
in
{
devShells.default = import ./shell.nix { inherit pkgs; };
}
);
}
21 changes: 13 additions & 8 deletions shell.nix
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
{ pkgs ? (let lock = builtins.fromJSON (builtins.readFile ./flake.lock);
in import (builtins.fetchTarball {
url =
"https://github.com/NixOS/nixpkgs/archive/${lock.nodes.nixpkgs.locked.rev}.tar.gz";
sha256 = lock.nodes.nixpkgs.locked.narHash;
}) { }) }:
{
pkgs ? (
let
lock = builtins.fromJSON (builtins.readFile ./flake.lock);
in
import (builtins.fetchTarball {
url = "https://github.com/NixOS/nixpkgs/archive/${lock.nodes.nixpkgs.locked.rev}.tar.gz";
sha256 = lock.nodes.nixpkgs.locked.narHash;
}) { }
),
}:

let
dependencies = with pkgs; [
Expand Down Expand Up @@ -40,9 +45,9 @@ let
alsa-lib
dbus
at-spi2-core
cups
];
in pkgs.mkShell {
in
pkgs.mkShell {
name = "space-station-14-devshell";
buildInputs = [ pkgs.gtk3 ];
packages = dependencies;
Expand Down

0 comments on commit bc18365

Please sign in to comment.