From 320b74fa8125a62da3b099fd923ee521b1ab4f83 Mon Sep 17 00:00:00 2001 From: Fiscal Velvet Poet Date: Fri, 22 Jul 2022 15:59:02 +1000 Subject: [PATCH] nix: removed legacy files --- default.nix | 22 ------ nix/sources.json | 26 ------- nix/sources.nix | 174 ----------------------------------------------- release.nix | 35 ---------- shell.nix | 12 ---- skeleton-web.nix | 11 --- 6 files changed, 280 deletions(-) delete mode 100644 default.nix delete mode 100644 nix/sources.json delete mode 100644 nix/sources.nix delete mode 100644 release.nix delete mode 100644 shell.nix delete mode 100644 skeleton-web.nix diff --git a/default.nix b/default.nix deleted file mode 100644 index 40944ab..0000000 --- a/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ nixpkgs ? import { }, compiler ? "default" }: -let - inherit (nixpkgs) pkgs; - haskellPackages = if compiler == "default" then - pkgs.haskellPackages - else - pkgs.haskell.packages.${compiler}; - skeleton-org = haskellPackages.callPackage ./skeleton-web.nix { }; -in nixpkgs.stdenv.mkDerivation { - name = "skeleton-org-website"; - buildInputs = [ skeleton-org ]; - src = ./.; - buildPhase = '' - echo "Setting LC_ALL to C.UTF-8 to avoid invalid byte sequence." - export LC_ALL=C.UTF-8 - site build - ''; - installPhase = '' - mkdir $out - cp -R _site/* $out - ''; -} diff --git a/nix/sources.json b/nix/sources.json deleted file mode 100644 index bbd0dd1..0000000 --- a/nix/sources.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "niv": { - "branch": "master", - "description": "Easy dependency management for Nix projects", - "homepage": "https://github.com/nmattia/niv", - "owner": "nmattia", - "repo": "niv", - "rev": "dd13098d01eaa6be68237e7e38f96782b0480755", - "sha256": "1cfjdbsn0219fjzam1k7nqzkz8fb1ypab50rhyj026qbklqq2kvq", - "type": "tarball", - "url": "https://github.com/nmattia/niv/archive/dd13098d01eaa6be68237e7e38f96782b0480755.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, - "nixpkgs": { - "branch": "nixos-23.11", - "description": "Nix Packages collection", - "homepage": "", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "c1be43e8e837b8dbee2b3665a007e761680f0c3d", - "sha256": "01g1lcpc281ba2dll1bkdxjn9w7dric0nk0zwm8dgrjxhad90zhb", - "type": "tarball", - "url": "https://github.com/nixos/nixpkgs/archive/c1be43e8e837b8dbee2b3665a007e761680f0c3d.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - } -} diff --git a/nix/sources.nix b/nix/sources.nix deleted file mode 100644 index 1938409..0000000 --- a/nix/sources.nix +++ /dev/null @@ -1,174 +0,0 @@ -# This file has been generated by Niv. - -let - - # - # The fetchers. fetch_ fetches specs of type . - # - - fetch_file = pkgs: name: spec: - let - name' = sanitizeName name + "-src"; - in - if spec.builtin or true then - builtins_fetchurl { inherit (spec) url sha256; name = name'; } - else - pkgs.fetchurl { inherit (spec) url sha256; name = name'; }; - - fetch_tarball = pkgs: name: spec: - let - name' = sanitizeName name + "-src"; - in - if spec.builtin or true then - builtins_fetchTarball { name = name'; inherit (spec) url sha256; } - else - pkgs.fetchzip { name = name'; inherit (spec) url sha256; }; - - fetch_git = name: spec: - let - ref = - if spec ? ref then spec.ref else - if spec ? branch then "refs/heads/${spec.branch}" else - if spec ? tag then "refs/tags/${spec.tag}" else - abort "In git source '${name}': Please specify `ref`, `tag` or `branch`!"; - in - builtins.fetchGit { url = spec.repo; inherit (spec) rev; inherit ref; }; - - fetch_local = spec: spec.path; - - fetch_builtin-tarball = name: throw - ''[${name}] The niv type "builtin-tarball" is deprecated. You should instead use `builtin = true`. - $ niv modify ${name} -a type=tarball -a builtin=true''; - - fetch_builtin-url = name: throw - ''[${name}] The niv type "builtin-url" will soon be deprecated. You should instead use `builtin = true`. - $ niv modify ${name} -a type=file -a builtin=true''; - - # - # Various helpers - # - - # https://github.com/NixOS/nixpkgs/pull/83241/files#diff-c6f540a4f3bfa4b0e8b6bafd4cd54e8bR695 - sanitizeName = name: - ( - concatMapStrings (s: if builtins.isList s then "-" else s) - ( - builtins.split "[^[:alnum:]+._?=-]+" - ((x: builtins.elemAt (builtins.match "\\.*(.*)" x) 0) name) - ) - ); - - # The set of packages used when specs are fetched using non-builtins. - mkPkgs = sources: system: - let - sourcesNixpkgs = - import (builtins_fetchTarball { inherit (sources.nixpkgs) url sha256; }) { inherit system; }; - hasNixpkgsPath = builtins.any (x: x.prefix == "nixpkgs") builtins.nixPath; - hasThisAsNixpkgsPath = == ./.; - in - if builtins.hasAttr "nixpkgs" sources - then sourcesNixpkgs - else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then - import {} - else - abort - '' - Please specify either (through -I or NIX_PATH=nixpkgs=...) or - add a package called "nixpkgs" to your sources.json. - ''; - - # The actual fetching function. - fetch = pkgs: name: spec: - - if ! builtins.hasAttr "type" spec then - abort "ERROR: niv spec ${name} does not have a 'type' attribute" - else if spec.type == "file" then fetch_file pkgs name spec - else if spec.type == "tarball" then fetch_tarball pkgs name spec - else if spec.type == "git" then fetch_git name spec - else if spec.type == "local" then fetch_local spec - else if spec.type == "builtin-tarball" then fetch_builtin-tarball name - else if spec.type == "builtin-url" then fetch_builtin-url name - else - abort "ERROR: niv spec ${name} has unknown type ${builtins.toJSON spec.type}"; - - # If the environment variable NIV_OVERRIDE_${name} is set, then use - # the path directly as opposed to the fetched source. - replace = name: drv: - let - saneName = stringAsChars (c: if isNull (builtins.match "[a-zA-Z0-9]" c) then "_" else c) name; - ersatz = builtins.getEnv "NIV_OVERRIDE_${saneName}"; - in - if ersatz == "" then drv else - # this turns the string into an actual Nix path (for both absolute and - # relative paths) - if builtins.substring 0 1 ersatz == "/" then /. + ersatz else /. + builtins.getEnv "PWD" + "/${ersatz}"; - - # Ports of functions for older nix versions - - # a Nix version of mapAttrs if the built-in doesn't exist - mapAttrs = builtins.mapAttrs or ( - f: set: with builtins; - listToAttrs (map (attr: { name = attr; value = f attr set.${attr}; }) (attrNames set)) - ); - - # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/lists.nix#L295 - range = first: last: if first > last then [] else builtins.genList (n: first + n) (last - first + 1); - - # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L257 - stringToCharacters = s: map (p: builtins.substring p 1 s) (range 0 (builtins.stringLength s - 1)); - - # https://github.com/NixOS/nixpkgs/blob/0258808f5744ca980b9a1f24fe0b1e6f0fecee9c/lib/strings.nix#L269 - stringAsChars = f: s: concatStrings (map f (stringToCharacters s)); - concatMapStrings = f: list: concatStrings (map f list); - concatStrings = builtins.concatStringsSep ""; - - # https://github.com/NixOS/nixpkgs/blob/8a9f58a375c401b96da862d969f66429def1d118/lib/attrsets.nix#L331 - optionalAttrs = cond: as: if cond then as else {}; - - # fetchTarball version that is compatible between all the versions of Nix - builtins_fetchTarball = { url, name ? null, sha256 }@attrs: - let - inherit (builtins) lessThan nixVersion fetchTarball; - in - if lessThan nixVersion "1.12" then - fetchTarball ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; })) - else - fetchTarball attrs; - - # fetchurl version that is compatible between all the versions of Nix - builtins_fetchurl = { url, name ? null, sha256 }@attrs: - let - inherit (builtins) lessThan nixVersion fetchurl; - in - if lessThan nixVersion "1.12" then - fetchurl ({ inherit url; } // (optionalAttrs (!isNull name) { inherit name; })) - else - fetchurl attrs; - - # Create the final "sources" from the config - mkSources = config: - mapAttrs ( - name: spec: - if builtins.hasAttr "outPath" spec - then abort - "The values in sources.json should not have an 'outPath' attribute" - else - spec // { outPath = replace name (fetch config.pkgs name spec); } - ) config.sources; - - # The "config" used by the fetchers - mkConfig = - { sourcesFile ? if builtins.pathExists ./sources.json then ./sources.json else null - , sources ? if isNull sourcesFile 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; - - # The "pkgs" (evaluated nixpkgs) to use for e.g. non-builtin fetchers - inherit pkgs; - }; - -in -mkSources (mkConfig {}) // { __functor = _: settings: mkSources (mkConfig settings); } diff --git a/release.nix b/release.nix deleted file mode 100644 index 567887f..0000000 --- a/release.nix +++ /dev/null @@ -1,35 +0,0 @@ -let sources = import ./nix/sources.nix; -in { compiler ? "ghc902", pkgs ? import sources.nixpkgs { } }: - -let - inherit (pkgs.lib.trivial) flip pipe; - inherit (pkgs.haskell.lib) appendPatch appendConfigureFlags; - - haskellPackages = pkgs.haskell.packages.${compiler}.override { - overrides = hpNew: hpOld: { - hakyll = pipe hpOld.hakyll [ - (flip appendPatch ./hakyll.patch) - (flip appendConfigureFlags [ "-f" "watchServer" "-f" "previewServer" ]) - ]; - - skeleton-web = hpNew.callCabal2nix "skeleton-web" ./. { }; - - niv = import sources.niv { }; - }; - }; - - project = haskellPackages.skeleton-web; -in { - project = project; - - shell = haskellPackages.shellFor { - packages = p: with p; [ project ]; - buildInputs = with haskellPackages; [ - ghcid # GHCi based IDE - hlint # or ormolu - pkgs.niv # Nix dependency management - pkgs.tea # Gitea official CLI client - ]; - withHoogle = true; - }; -} diff --git a/shell.nix b/shell.nix deleted file mode 100644 index aad4bcf..0000000 --- a/shell.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - pkgs ? import {}, - alejandra, - mkShell, -}: -with pkgs; - mkShell { - buildInputs = [ - alejandra # The Uncompromising Nix Code Formatter - treefmt # one CLI to format the code tree - ]; - } diff --git a/skeleton-web.nix b/skeleton-web.nix deleted file mode 100644 index 5d6b33a..0000000 --- a/skeleton-web.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ mkDerivation, base, hakyll, stdenv }: -mkDerivation { - pname = "skeleton-web"; - version = "0.1.0.0"; - src = ./.; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ base hakyll ]; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; -}