tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump nixpkgs rev (#25361)

Browse Source 
* Bump nixpkgs revision

* Update nix-direnv

* Remove extra nix functionalities

Both nix-direnv and legacy command nix-shell fail. Reverting to
flakes-only commands.

* Pin nixpkgs per suggestion

See https://github.com/space-wizards/space-station-14/pull/25361#discussion_r1494196038

* Revert nix-direnv removal

* Add python3 to shell.nix
This commit is contained in:
Ioannis Eleftheriou
2024-02-19 18:08:05 +00:00
committed by GitHub
parent bec96f3016
commit 16d18abdcf
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.envrc
View File

@@ -1,4 +1,4 @@
if ! has nix_direnv_version || ! nix_direnv_version 2.3.0; then if ! has nix_direnv_version || ! nix_direnv_version 3.0.4; then
source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.3.0/direnvrc" "sha256-Dmd+j63L84wuzgyjITIfSxSD57Tx7v51DMxVZOsiUD8=" source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.4/direnvrc" "sha256-DzlYZ33mWF/Gs8DDeyjr8mnVmQGx7ASYqA5WlxwvBG4="
fi fi
use flake use flake

6
flake.lock generated
View File

@@ -20,11 +20,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1706213598, "lastModified": 1708210246,
"narHash": "sha256-Toz3HEHeq6Esr5uDOMel8BiGSa94gj+og3Yz4YEgjYI=", "narHash": "sha256-Q8L9XwrBK53fbuuIFMbjKvoV7ixfLFKLw4yV+SD28Y8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cda0e75a0bd7cf05bd3e40658c163e4f8f376b7b", "rev": "69405156cffbdf2be50153f13cbdf9a0bea38e49",
"type": "github" "type": "github"
}, },
"original": { "original": {

10
shell.nix
View File

@@ -1,8 +1,9 @@
{ pkgs ? import (builtins.fetchTarball { { pkgs ? (let lock = builtins.fromJSON (builtins.readFile ./flake.lock);
in import (builtins.fetchTarball {
url = url =
"https://github.com/NixOS/nixpkgs/archive/cda0e75a0bd7cf05bd3e40658c163e4f8f376b7b.tar.gz"; "https://github.com/NixOS/nixpkgs/archive/${lock.nodes.nixpkgs.locked.rev}.tar.gz";
sha256 = "sha256-Toz3HEHeq6Esr5uDOMel8BiGSa94gj+og3Yz4YEgjYI="; sha256 = lock.nodes.nixpkgs.locked.narHash;
}) { } }: }) { }) }:
let let
dependencies = with pkgs; [ dependencies = with pkgs; [
@@ -41,6 +42,7 @@ let
dbus dbus
at-spi2-core at-spi2-core
cups cups
python3
]; ];
in pkgs.mkShell { in pkgs.mkShell {
name = "space-station-14-devshell"; name = "space-station-14-devshell";