Skip to content

Commit

Permalink
Remove Unnecessary Uses of rec
Browse files Browse the repository at this point in the history
  • Loading branch information
sivizius committed Feb 1, 2024
1 parent 290965a commit 5f82e0c
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 7 deletions.
4 changes: 1 addition & 3 deletions default.nix
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
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
@@ -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
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
@@ -1,6 +1,6 @@
{ sources, lib, python3Packages }:

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

Expand Down

0 comments on commit 5f82e0c

Please sign in to comment.