From f19d5552639eebc5b8997aa19d5860c5dfc38597 Mon Sep 17 00:00:00 2001 From: Fuwn Date: Mon, 7 Mar 2022 21:32:25 -0800 Subject: chore(nix): remove --- .dockerignore | 1 - .gitignore | 11 ---- default.nix | 47 --------------- docker.nix | 43 ------------- nix/dhall-yaml.nix | 5 -- nix/rust.nix | 9 --- nix/sources.json | 50 --------------- nix/sources.nix | 174 ----------------------------------------------------- shell.nix | 26 -------- 9 files changed, 366 deletions(-) delete mode 100644 .dockerignore delete mode 100644 default.nix delete mode 100644 docker.nix delete mode 100644 nix/dhall-yaml.nix delete mode 100644 nix/rust.nix delete mode 100644 nix/sources.json delete mode 100644 nix/sources.nix delete mode 100644 shell.nix diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index 6b8710a..0000000 --- a/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -.git diff --git a/.gitignore b/.gitignore index 25140cb..9d30354 100644 --- a/.gitignore +++ b/.gitignore @@ -9,16 +9,5 @@ Cargo.lock # These are backup files generated by rustfmt **/*.rs.bk -# nix -result* - # ide /.idea/ -/senpy-api.iml - -# development -.env -/shell-dev.nix - -# npm -/node_modules/ diff --git a/default.nix b/default.nix deleted file mode 100644 index b963f0b..0000000 --- a/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ sources ? import ./nix/sources.nix, pkgs ? import sources.nixpkgs { } }: -with pkgs; - -let - rust = pkgs.callPackage ./nix/rust.nix { }; - - srcNoTarget = dir: - builtins.filterSource - (path: type: type != "directory" || builtins.baseNameOf path != "target") - dir; - - naersk = pkgs.callPackage sources.naersk { - rustc = rust; - cargo = rust; - }; - dhallpkgs = import sources.easy-dhall-nix { inherit pkgs; }; - src = srcNoTarget ./.; - - senpy-api = naersk.buildPackage { - inherit src; - doCheck = true; - buildInputs = [ ]; - remapPathPrefix = true; - }; - - config = stdenv.mkDerivation { - pname = "senpy-api-config"; - version = "HEAD"; - buildInputs = [ dhallpkgs.dhall-simple ]; - -# phases = "installPhase"; -# -# installPhase = '' -# ''; - }; - -in pkgs.stdenv.mkDerivation { - inherit (senpy-api) name; - inherit src; - phases = "installPhase"; - - installPhase = '' - mkdir -p $out $out/bin - - cp -rf ${senpy-api}/bin/senpy-api $out/bin/senpy-api - ''; -} diff --git a/docker.nix b/docker.nix deleted file mode 100644 index 8de863e..0000000 --- a/docker.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ system ? builtins.currentSystem }: - -let - sources = import ./nix/sources.nix; - pkgs = import sources.nixpkgs { }; - callPackage = pkgs.lib.callPackageWith pkgs; - senpy-api = callPackage ./default.nix { }; - - dockerImage = pkg: - pkgs.dockerTools.buildImage { - name = "senpy-club/api"; - tag = "latest"; - created = "now"; - - fromImage = pkgs.dockerTools.pullImage { - imageName = "alpine"; - imageDigest = "sha256:def822f9851ca422481ec6fee59a9966f12b351c62ccb9aca841526ffaa9f748"; - # https://nixos.wiki/wiki/Docker - # - # The above article didn't even work for me, ROFL. - # `nix-build docker.nix` threw an error about the sha256 being - # incorrect, but it also spat our the expected sha256... - # - # so I just replaced it... - sha256 = "1z6fh6ry14m5cpcjfg88vn2m36garmgdagr4vfc3pm1z3kph639n"; - finalImageTag = "alpine"; - finalImageName = "3.13.5"; - }; - - contents = [ pkg ]; - - config = { - Cmd = [ "run" ]; - WorkingDir = "/"; - Env = [ "PORT=80" ]; - ExposedPorts = { - "80/tcp" = { }; - }; - EntryPoint = [ "/bin/senpy-api" ]; - }; - }; - -in dockerImage senpy-api diff --git a/nix/dhall-yaml.nix b/nix/dhall-yaml.nix deleted file mode 100644 index ddb8c3d..0000000 --- a/nix/dhall-yaml.nix +++ /dev/null @@ -1,5 +0,0 @@ -let - sources = import ./sources.nix; - pkgs = import sources.nixpkgs { }; - dhall = import sources.easy-dhall-nix { inherit pkgs; }; -in dhall.dhall-yaml-simple diff --git a/nix/rust.nix b/nix/rust.nix deleted file mode 100644 index 77c9190..0000000 --- a/nix/rust.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ sources ? import ./sources.nix }: - -let - pkgs = import sources.nixpkgs { overlays = [ (import sources.nixpkgs-mozilla) ]; }; - channel = "nightly"; - date = "2021-04-24"; - targets = [ ]; - chan = pkgs.rustChannelOfTargets channel date targets; -in chan diff --git a/nix/sources.json b/nix/sources.json deleted file mode 100644 index 33453bf..0000000 --- a/nix/sources.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "naersk": { - "branch": "master", - "description": "Build rust crates in Nix. No configuration, no code generation, no IFD. Sandbox friendly.", - "homepage": "", - "owner": "nmattia", - "repo": "naersk", - "rev": "32e3ba39d9d83098b13720a4384bdda191dd0445", - "sha256": "0yxqggmj4c65nzmgjmwxii9ibxmxw9w87pbqpgmnyf5rpyp79nv7", - "type": "tarball", - "url": "https://github.com/nmattia/naersk/archive/32e3ba39d9d83098b13720a4384bdda191dd0445.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, - "niv": { - "branch": "master", - "description": "Easy dependency management for Nix projects", - "homepage": "https://github.com/nmattia/niv", - "owner": "nmattia", - "repo": "niv", - "rev": "af958e8057f345ee1aca714c1247ef3ba1c15f5e", - "sha256": "1qjavxabbrsh73yck5dcq8jggvh3r2jkbr6b5nlz5d9yrqm9255n", - "type": "tarball", - "url": "https://github.com/nmattia/niv/archive/af958e8057f345ee1aca714c1247ef3ba1c15f5e.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, - "nixpkgs": { - "branch": "release-20.03", - "description": "Nix Packages collection", - "homepage": "", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6d1a044fc9ff3cc96fca5fa3ba9c158522bbf2a5", - "sha256": "07a3nyrj3pwl017ig0rbn5rbmbf14gl3vqggvkyrdby01726p5fg", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/6d1a044fc9ff3cc96fca5fa3ba9c158522bbf2a5.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, - "nixpkgs-mozilla": { - "branch": "master", - "description": "mozilla related nixpkgs (extends nixos/nixpkgs repo)", - "homepage": "", - "owner": "mozilla", - "repo": "nixpkgs-mozilla", - "rev": "8c007b60731c07dd7a052cce508de3bb1ae849b4", - "sha256": "1zybp62zz0h077zm2zmqs2wcg3whg6jqaah9hcl1gv4x8af4zhs6", - "type": "tarball", - "url": "https://github.com/mozilla/nixpkgs-mozilla/archive/8c007b60731c07dd7a052cce508de3bb1ae849b4.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/shell.nix b/shell.nix deleted file mode 100644 index b44bca0..0000000 --- a/shell.nix +++ /dev/null @@ -1,26 +0,0 @@ -let - sources = import ./nix/sources.nix; - pkgs = import sources.nixpkgs { overlays = [ (import sources.nixpkgs-mozilla) ]; }; - dhallpkgs = import sources.easy-dhall-nix { inherit pkgs; }; - dhall-yaml = dhallpkgs.dhall-yaml-simple; - dhall = dhallpkgs.dhall-simple; - rust = pkgs.callPackage ./nix/rust.nix { }; -in pkgs.mkShell { - buildInputs = with pkgs; [ - # Rust - rust - cargo-make - diesel-cli - cargo-watch - - # Dhall - dhall - dhall-yaml - - # Dependecy manager - niv - ]; - - RUST_SRC_PATH = "${pkgs.latest.rustChannels.nightly.rust-src}/lib/rustlib/src/rust/library"; - RUST_BACKTRACE = "1"; -} -- cgit v1.2.3