Skip to content

Commit e1bdba4

Browse files
committed
Remove flake-compat; it's superfluous now this is a flakes-only project
1 parent a7adcaa commit e1bdba4

File tree

14 files changed

+4
-189
lines changed

14 files changed

+4
-189
lines changed

.last-exported-commit

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Last exported commit from parent repo: 24ab99343fb9881b5e328f9e2b6ba21e5558eee3
1+
Last exported commit from parent repo: 4ebe38586c16c453f72e8b3561d66e679aa09483

default.nix

Lines changed: 0 additions & 14 deletions
This file was deleted.

flake.lock

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,11 @@
1414
{
1515
description = "Development infrastructure for nix-bootstrap";
1616
inputs = {
17-
flake-compat = {
18-
flake = false;
19-
url = github:edolstra/flake-compat;
20-
};
2117
flake-utils.url = "github:numtide/flake-utils";
2218
nixpkgs-src.url = "github:NixOS/nixpkgs?rev=b62d2a95c72fb068aecd374a7262b37ed92df82b";
2319
# Needed to get non-broken vulnix
2420
nixpkgs-src-previous.url = "github:NixOS/nixpkgs?rev=89172919243df199fe237ba0f776c3e3e3d72367";
2521
pre-commit-hooks-lib = {
26-
inputs.flake-compat.follows = "flake-compat";
2722
inputs.nixpkgs.follows = "nixpkgs-src";
2823
url = "github:cachix/pre-commit-hooks.nix";
2924
};

nix-bootstrap.cabal

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ cabal-version: 2.0
55
-- see: https://github.com/sol/hpack
66

77
name: nix-bootstrap
8-
version: 2.1.1.1
8+
version: 2.2.0.0
99
author: gchquser
1010
maintainer: [email protected]
1111
copyright: Crown Copyright
@@ -45,7 +45,6 @@ library
4545
Bootstrap.Data.Bootstrappable.Haskell.PreludeHs
4646
Bootstrap.Data.Bootstrappable.HaskellPackagesNix
4747
Bootstrap.Data.Bootstrappable.NixPreCommitHookConfig
48-
Bootstrap.Data.Bootstrappable.NixShellCompat
4948
Bootstrap.Data.Bootstrappable.Python.Requirements
5049
Bootstrap.Data.Bootstrappable.Readme
5150
Bootstrap.Data.Bootstrappable.Rust.CargoLock
@@ -191,7 +190,6 @@ test-suite nix-bootstrap-test
191190
Bootstrap.Data.Bootstrappable.Haskell.PreludeHsSpec
192191
Bootstrap.Data.Bootstrappable.HaskellPackagesNixSpec
193192
Bootstrap.Data.Bootstrappable.NixPreCommitHookConfigSpec
194-
Bootstrap.Data.Bootstrappable.NixShellCompatSpec
195193
Bootstrap.Data.Bootstrappable.ReadmeSpec
196194
Bootstrap.Data.Bootstrappable.Rust.CargoLockSpec
197195
Bootstrap.Data.Bootstrappable.Rust.CargoTomlSpec

nix/flake-compat.nix

Lines changed: 0 additions & 29 deletions
This file was deleted.

package.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414
name: nix-bootstrap
15-
version: 2.1.1.1
15+
version: 2.2.0.0
1616
author: gchquser
1717
maintainer: [email protected]
1818
copyright: Crown Copyright

shell.nix

Lines changed: 0 additions & 20 deletions
This file was deleted.

src/Bootstrap.hs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ import Bootstrap.Data.Bootstrappable.Haskell.PackageYaml (packageYamlFor)
4444
import Bootstrap.Data.Bootstrappable.Haskell.PreludeHs (preludeHsFor)
4545
import Bootstrap.Data.Bootstrappable.HaskellPackagesNix (haskellPackagesNixFor)
4646
import Bootstrap.Data.Bootstrappable.NixPreCommitHookConfig (nixPreCommitHookConfigFor)
47-
import Bootstrap.Data.Bootstrappable.NixShellCompat (NixShellCompat (NixShellCompat))
4847
import Bootstrap.Data.Bootstrappable.Python.Requirements (Requirements (Requirements))
4948
import Bootstrap.Data.Bootstrappable.Readme
5049
( Readme
@@ -462,7 +461,6 @@ makeNonPythonBuildPlan MakeBuildPlanArgs {..} = do
462461
~: initialReadme
463462
~: buildNix
464463
~: flakeNixFor mbpProjectName mbpProjectType mbpPreCommitHooksConfig nixPreCommitHookConfig buildNix
465-
~: NixShellCompat
466464
~: nixPreCommitHookConfig
467465
~: gitlabCIConfigFor mbpContinuousIntegrationConfig mbpProjectType nixPreCommitHookConfig
468466
~: devContainerDockerComposeFor mbpDevContainerConfig mbpProjectName

src/Bootstrap/Data/Bootstrappable/FlakeNix.hs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -218,10 +218,6 @@ instance IsNixExpr FlakeNix where
218218
|= ESet
219219
False
220220
( [ [nixbinding|nixpkgs-src.url = "github:NixOS/nixpkgs";|],
221-
[nixbinding|flake-compat = {
222-
flake = false;
223-
url = github:edolstra/flake-compat;
224-
};|],
225221
[nixbinding|flake-utils.url = "github:numtide/flake-utils";|]
226222
]
227223
<> [ [nixbinding|pre-commit-hooks-lib.url = "github:cachix/pre-commit-hooks.nix";|]

0 commit comments

Comments
 (0)