Skip to content
Snippets Groups Projects
Commit 4ae611d2 authored by Daniel Firth's avatar Daniel Firth
Browse files

Merge branch 'lint-utils' into 'master' 

Lint utils

See merge request !2
parents 71c9168a bf236387
2 merge requests!2Lint utils,!1replace .cachix.dhall with devour-flake
Pipeline #1203 failed with stages
in 11 minutes and 1 second
Hide whitespace changes
Inline Side-by-side
.cachix.dhall deleted 100644 → 0
+ 0
− 40
View file @ 71c9168a
let Prelude =
env:DHALL_PRELUDE
? https://raw.githubusercontent.com/dhall-lang/dhall-lang/v20.1.0/Prelude/package.dhall
sha256:26b0ef498663d269e4dc6a82b0ee289ec565d683ef4c00d0ebdd25333a5a3c98
let H =
https://gitlab.horizon-haskell.net/dhall/horizon-spec/-/raw/0.6/dhall/package.dhall
sha256:9a80164572526dc5350f105c8db0790fdf36634629b4cf03402ba14fd173d121
let toStep
: Text → Text
= λ(x : Text) →
"nix build --accept-flake-config --json .#${x} | jq -r '.[].outputs | to_entries[].value' | cachix push horizon"
let toEchoStep
: Text → Text
= λ(x : Text) → "echo \"${toStep x}\""
let input =
Prelude.Map.keys
Text
H.HaskellPackage.Type
( merge
{ MakePackageSet =
λ(x : H.PackageSetExportSettings) → x.packageSet.packages
, MakeOverlay = λ(x : H.OverlayExportSettings) → x.overlay.packages
}
./horizon.dhall
)
let packages = Prelude.List.map Text Text toEchoStep (input : List Text)
in "("
++ Prelude.List.fold
Text
packages
Text
(λ(x : Text) → λ(y : Text) → x ++ ";" ++ y)
""
++ ") | parallel -j 16"
.gitlab-ci.yml
+ 9
− 7
View file @ 4ae611d2
stages:
- generate
- check
- flake
- cache
generate-flake-ci:
stage: generate
script: nix run "git+https://gitlab.homotopic.tech/haskell/flake-to-gitlab-ci?ref=refs/tags/0.2.2.0" > flake-ci.yml
script:
- nix run "git+https://gitlab.nixica.dev/haskell/flake-to-gitlab-ci?ref=refs/tags/0.2.4.1" > flake-ci-x86_64-linux.yml
artifacts:
paths:
- flake-ci.yml
- flake-ci-x86_64-linux.yml
flake-ci:
stage: check
x86_64-linux-ci:
stage: flake
trigger:
include:
- artifact: flake-ci.yml
- artifact: flake-ci-x86_64-linux.yml
job: generate-flake-ci
strategy: depend
......@@ -24,4 +25,5 @@ cachix:
refs:
- master
- cachix
script: nix-shell -p jq cachix parallel --command 'dhall --file .cachix.dhall | dhall text | bash'
script:
- nix-shell -p cachix --command "nix build github:srid/devour-flake -L --no-link --print-out-paths --override-input flake . | xargs cat | cachix push horizon"
flake.lock
+ 70
− 47
View file @ 4ae611d2
{
"nodes": {
"flake-utils": {
"flake-parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"lastModified": 1678379998,
"narHash": "sha256-TZdfNqftHhDuIFwBcN9MUThx5sQXCTeZk9je5byPKRw=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "c13d60b89adea3dc20704c045ec4d50dd964d447",
"type": "github"
},
"original": {
"id": "flake-utils",
"type": "indirect"
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils_2": {
"flake-utils": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
......@@ -28,7 +32,7 @@
"type": "indirect"
}
},
"flake-utils_3": {
"flake-utils_2": {
"locked": {
"lastModified": 1644229661,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
......@@ -43,7 +47,7 @@
"type": "github"
}
},
"flake-utils_4": {
"flake-utils_3": {
"locked": {
"lastModified": 1644229661,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
......@@ -75,11 +79,11 @@
},
"get-flake_2": {
"locked": {
"lastModified": 1644686428,
"narHash": "sha256-zkhYsURWFrvEZLkIoBeqFBzSu+cA2u5mo6M8vq9LN7M=",
"lastModified": 1673819588,
"narHash": "sha256-gRtwKAlu4htvS6dxyZnW3n+vMS1acqnMGVHqxUdETeY=",
"owner": "ursi",
"repo": "get-flake",
"rev": "703f15558daa56dfae19d1858bb3046afe68831a",
"rev": "e0917b6f564aa5acefb1484b5baf76da21746c3c",
"type": "github"
},
"original": {
......@@ -90,78 +94,79 @@
},
"horizon-platform": {
"inputs": {
"flake-utils": "flake-utils_2",
"flake-parts": "flake-parts",
"get-flake": "get-flake_2",
"horizon-platform": "horizon-platform_2",
"horizon-shell-flake": "horizon-shell-flake",
"lint-utils": "lint-utils",
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1673447571,
"narHash": "sha256-0Z+UH4vJXT9FfonmfZ8KuvlJxQ9iXqz/YGn5HTXDzaA=",
"lastModified": 1682634802,
"narHash": "sha256-xH70JAww4HOZFtG8XEy7GCSOXpQwuduwVHDgHfFbIuE=",
"ref": "refs/heads/master",
"rev": "046c7305362aa0b3445539f9d78e648dd65167b7",
"revCount": 886,
"rev": "0a45cc04a27f1ca6e6974c17c4d1ad33ac592f8f",
"revCount": 1073,
"type": "git",
"url": "https://gitlab.homotopic.tech/horizon/horizon-platform"
"url": "https://gitlab.horizon-haskell.net/package-sets/horizon-platform"
},
"original": {
"type": "git",
"url": "https://gitlab.homotopic.tech/horizon/horizon-platform"
"url": "https://gitlab.horizon-haskell.net/package-sets/horizon-platform"
}
},
"horizon-platform_2": {
"horizon-shell-flake": {
"flake": false,
"locked": {
"lastModified": 1672428555,
"narHash": "sha256-+Aui0RtWnkWjSSbOrcg1zcnETuyD44YBj0WJ9fZsogI=",
"ref": "refs/heads/master",
"rev": "e187fb1aff7b3aad3cd81f11c5df6963d65b67ed",
"revCount": 804,
"lastModified": 1679524452,
"narHash": "sha256-xzNxvLVa3o0F/z4CnBDORv2Y6PfxjlGv7b7LybIyCSg=",
"ref": "refs/tags/0.0.8",
"rev": "21b8913803cefeb287bb244c7ee335638233db7f",
"revCount": 21,
"type": "git",
"url": "https://gitlab.homotopic.tech/horizon/horizon-platform"
"url": "https://gitlab.horizon-haskell.net/shells/horizon-shell"
},
"original": {
"ref": "refs/tags/0.0.8",
"type": "git",
"url": "https://gitlab.homotopic.tech/horizon/horizon-platform"
"url": "https://gitlab.horizon-haskell.net/shells/horizon-shell"
}
},
"lint-utils": {
"inputs": {
"flake-utils": "flake-utils_3",
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1670623736,
"narHash": "sha256-CrA/yua5H0NfZ2tu1QZ2WpYi6pkWzyFxiwGk+KoF620=",
"lastModified": 1681737193,
"narHash": "sha256-c+0eLyF/VWZWGeB1DA88aDUZ3BjO6+jnsJpVW4wxs4w=",
"ref": "refs/heads/master",
"rev": "ee76287dc9987dd01ec38d38839b788a26ee5f24",
"revCount": 45,
"rev": "efaf89d12a6811f0e00034444904b8d169f0fa34",
"revCount": 48,
"type": "git",
"url": "https://gitlab.homotopic.tech/nix/lint-utils"
"url": "https://gitlab.nixica.dev/nix/lint-utils"
},
"original": {
"type": "git",
"url": "https://gitlab.homotopic.tech/nix/lint-utils"
"url": "https://gitlab.nixica.dev/nix/lint-utils"
}
},
"lint-utils_2": {
"inputs": {
"flake-utils": "flake-utils_4",
"flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1670623736,
"narHash": "sha256-CrA/yua5H0NfZ2tu1QZ2WpYi6pkWzyFxiwGk+KoF620=",
"lastModified": 1681737193,
"narHash": "sha256-c+0eLyF/VWZWGeB1DA88aDUZ3BjO6+jnsJpVW4wxs4w=",
"ref": "refs/heads/master",
"rev": "ee76287dc9987dd01ec38d38839b788a26ee5f24",
"revCount": 45,
"rev": "efaf89d12a6811f0e00034444904b8d169f0fa34",
"revCount": 48,
"type": "git",
"url": "https://gitlab.homotopic.tech/nix/lint-utils"
"url": "https://gitlab.nixica.dev/nix/lint-utils"
},
"original": {
"type": "git",
"url": "https://gitlab.homotopic.tech/nix/lint-utils"
"url": "https://gitlab.nixica.dev/nix/lint-utils"
}
},
"nixpkgs": {
......@@ -180,13 +185,31 @@
"type": "github"
}
},
"nixpkgs-lib": {
"locked": {
"dir": "lib",
"lastModified": 1678375444,
"narHash": "sha256-XIgHfGvjFvZQ8hrkfocanCDxMefc/77rXeHvYdzBMc8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "130fa0baaa2b93ec45523fdcde942f6844ee9f6e",
"type": "github"
},
"original": {
"dir": "lib",
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1672397839,
"narHash": "sha256-o+TBFFNSdOu5L1CUetXGMSinghqqlWcI2Sj9GVoJmUY=",
"lastModified": 1679198465,
"narHash": "sha256-VfXpHpniNWgg7pBzxb20pRX7kqn80LApPDQYTReiFCw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a3f612564c15e8471dd17c15efaf7ede83c57763",
"rev": "5a05160f7671434e1c833b1b01284b876e04eca4",
"type": "github"
},
"original": {
......
flake.nix
+ 2
− 2
View file @ 4ae611d2
......@@ -8,8 +8,8 @@
inputs = {
get-flake.url = "github:ursi/get-flake";
horizon-platform.url = "git+https://gitlab.homotopic.tech/horizon/horizon-platform";
lint-utils.url = "git+https://gitlab.homotopic.tech/nix/lint-utils";
horizon-platform.url = "git+https://gitlab.horizon-haskell.net/package-sets/horizon-platform";
lint-utils.url = "git+https://gitlab.nixica.dev/nix/lint-utils";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
};
......
horizon.dhall
+ 0
− 1
View file @ 4ae611d2
......@@ -4,7 +4,6 @@ let H =
let packages =
{ BiobaseENA = H.callHackage "BiobaseENA" "0.0.0.2"
, BiobaseTypes = H.callHackage "BiobaseTypes" "0.2.1.0"
, BiobaseXNA = H.callHackage "BiobaseXNA" "0.11.1.1"
, DPutils = H.callHackage "DPutils" "0.1.1.0"
, ForestStructures = H.callHackage "ForestStructures" "0.0.1.0"
, Octree = H.callHackage "Octree" "0.6.0.1"
......
horizon.lock
+ 0
− 4
View file @ 4ae611d2
......@@ -6,10 +6,6 @@
, mapValue =
"b398300e7610cb49a67a50cc84bcf2474cf3b3283f2c74a6ddbf5070406b098d"
}
, { mapKey = "BiobaseXNA"
, mapValue =
"6fa2ad6bc04be8a0729bfe44fce22ffbd4922ca7151faf4de5fd60a4d37e447c"
}
, { mapKey = "DPutils"
, mapValue =
"766fc49182f944e6ce3a9eaaac172268d25eb9e7d27316bf00bd49f3240ebce8"
......
overlay.nix
+ 0
− 2
View file @ 4ae611d2
......@@ -5,8 +5,6 @@ final: prev: with pkgs.haskell.lib; {
BiobaseTypes = final.callPackage (./pkgs/BiobaseTypes.nix) { };
BiobaseXNA = final.callPackage (./pkgs/BiobaseXNA.nix) { };
DPutils = final.callPackage (./pkgs/DPutils.nix) { };
ForestStructures = final.callPackage (./pkgs/ForestStructures.nix) { };
......
pkgs/BiobaseFR3D.nix deleted 100644 → 0
+ 0
− 25
View file @ 71c9168a
{ mkDerivation, BiobaseXNA, base, bytestring, containers, filemanip
, iteratee, lib, tuple
}:
mkDerivation {
pname = "BiobaseFR3D";
version = "0.2.3.0";
sha256 = "903dd78d6a0f923c0cb044ef055765f43813bdb0997111012593e08756c70af9";
isLibrary = true;
isExecutable = false;
enableSeparateDataOutput = false;
libraryHaskellDepends = [
base BiobaseXNA bytestring containers filemanip iteratee tuple
];
enableLibraryProfiling = true;
enableExecutableProfiling = true;
doHaddock = false;
jailbreak = true;
doCheck = false;
doBenchmark = false;
hyperlinkSource = false;
homepage = "http://www.tbi.univie.ac.at/~choener/";
description = "Importer for FR3D resources";
license = lib.licenses.gpl3Only;
broken = false;
}
\ No newline at end of file
pkgs/BiobaseXNA.nix deleted 100644 → 0
+ 0
− 48
View file @ 71c9168a
{ mkDerivation, BiobaseENA, BiobaseTypes, DPutils, ForestStructures
, PrimitiveArray, QuickCheck, aeson, attoparsec, base, bimaps
, binary, bytes, bytestring, cereal, cereal-vector, cmdargs
, containers, csv, data-default, deepseq, file-embed, hashable
, lens, lib, mtl, primitive, split, tasty, tasty-quickcheck
, tasty-th, text, tuple, vector, vector-binary-instances
, vector-th-unbox
}:
mkDerivation {
pname = "BiobaseXNA";
version = "0.11.1.1";
sha256 = "3578c7ab6b90c14e83cc0d54929b697aca38ea871e24f12d3cf5495afee84973";
isLibrary = true;
isExecutable = true;
enableSeparateDataOutput = true;
libraryHaskellDepends = [
aeson attoparsec base bimaps binary BiobaseENA BiobaseTypes bytes
bytestring cereal cereal-vector containers csv data-default deepseq
DPutils file-embed ForestStructures hashable lens mtl primitive
PrimitiveArray QuickCheck split text tuple vector
vector-binary-instances vector-th-unbox
];
executableHaskellDepends = [
aeson attoparsec base bimaps binary BiobaseENA BiobaseTypes bytes
bytestring cereal cereal-vector cmdargs containers csv data-default
deepseq DPutils file-embed ForestStructures hashable lens mtl
primitive PrimitiveArray QuickCheck split text tuple vector
vector-binary-instances vector-th-unbox
];
testHaskellDepends = [
aeson attoparsec base bimaps binary BiobaseENA BiobaseTypes bytes
bytestring cereal cereal-vector containers csv data-default deepseq
DPutils file-embed ForestStructures hashable lens mtl primitive
PrimitiveArray QuickCheck split tasty tasty-quickcheck tasty-th
text tuple vector vector-binary-instances vector-th-unbox
];
enableLibraryProfiling = true;
enableExecutableProfiling = true;
doHaddock = false;
jailbreak = true;
doCheck = false;
doBenchmark = false;
hyperlinkSource = false;
homepage = "https://github.com/choener/BiobaseXNA";
description = "Efficient RNA/DNA/Protein Primary/Secondary Structure";
license = lib.licenses.bsd3;
broken = false;
}
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment