Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Unnecessary Uses of rec #390

Merged
merged 2 commits into from
Feb 21, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 1 addition & 3 deletions default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
}:

let
files = pkgs.callPackage ./nix/files.nix { };

sourceByRegex = name: src: regexes:
builtins.path {
filter = path: type:
Expand Down Expand Up @@ -42,7 +40,7 @@ let
];

haskellPackages = pkgs.haskellPackages.override {
overrides = self: super: rec {
overrides = self: super: {

niv =
pkgs.haskell.lib.justStaticExecutables (
Expand Down
2 changes: 1 addition & 1 deletion examples/cpp-libosmium/nix/sources.nix
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ let
{ sourcesFile ? ./sources.json
, sources ? builtins.fromJSON (builtins.readFile sourcesFile)
, pkgs ? mkPkgs sources
}: rec {
}: {
# The sources, i.e. the attribute set of spec name to spec
inherit sources;

Expand Down
2 changes: 1 addition & 1 deletion examples/cpp-libosmium/overlay/libosmium.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, cmake, protozero, expat, zlib, bzip2, boost, sources }:

stdenv.mkDerivation rec {
stdenv.mkDerivation {
name = "libosmium";
src = sources.libosmium;

Expand Down
2 changes: 1 addition & 1 deletion nix/sources.nix
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ let
, sources ? if sourcesFile == null then { } else builtins.fromJSON (builtins.readFile sourcesFile)
, system ? builtins.currentSystem
, pkgs ? mkPkgs sources system
}: rec {
}: {
# The sources, i.e. the attribute set of spec name to spec
inherit sources;

Expand Down
2 changes: 1 addition & 1 deletion nix/termtosvg.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ sources, lib, python3Packages }:

python3Packages.buildPythonApplication rec {
python3Packages.buildPythonApplication {
pname = "termtosvg";
version = "0.0.0";

Expand Down