~jack/libtelnet-haskell

22d0f75365bc5e34abf25066cb7a421095eb0768 — Jack Kelly 8 months ago 5720e92
Add niv, update nixpkgs, tighten lower bound
M .build.yml => .build.yml +6 -9
@@ 4,18 4,15 @@ repositories:
sources:
  - https://git.sr.ht/~jack/libtelnet-haskell
tasks:
  - ghc865: |
      cd libtelnet-haskell
      nix-build --arg buildExample true --argstr compiler ghc865
  - ghc864: |
  - ghc8103: |
      cd libtelnet-haskell
      nix-build --arg buildExample true --argstr compiler ghc864
  - ghc844: |
      nix-build --arg buildExample true --argstr compiler ghc8103
  - ghc884: |
      cd libtelnet-haskell
      nix-build --arg buildExample true --argstr compiler ghc844
  - ghc822: |
      nix-build --arg buildExample true --argstr compiler ghc884
  - ghc865: |
      cd libtelnet-haskell
      nix-build --arg buildExample true --argstr compiler ghc822
      nix-build --arg buildExample true --argstr compiler ghc865
triggers:
  - condition: failure
    action: email

M CHANGELOG.md => CHANGELOG.md +4 -0
@@ 1,5 1,9 @@
# Revision history for libtelnet

## 0.1.0.1 -- 2021-02-13

* Silence a redundant import warning. This raises the lower bound on `base`.

## 0.1.0.0 -- 2019-02-03

* First version. Released on an unsuspecting world.

M default.nix => default.nix +4 -2
@@ 1,7 1,9 @@
{ nixpkgs ? import <nixpkgs> {}
{ sources ? import ./nix/sources.nix
, nixpkgsArgs ? {}
, nixpkgs ? import sources.nixpkgs nixpkgsArgs
, compiler ? "default"
, buildExample ? false
, doBenchmark ? false
, buildExample ? false
}:

let

M libtelnet.cabal => libtelnet.cabal +7 -8
@@ 1,6 1,6 @@
cabal-version:       >=1.10
cabal-version:       2.2
name:                libtelnet
version:             0.1.0.0
version:             0.1.0.1
synopsis:            Bindings to libtelnet
description:         Binds https://github.com/seanmiddleditch/libtelnet , a C
                     library for writing telnet clients and


@@ 15,11 15,10 @@ maintainer:          jack@jackkelly.name
copyright:           (c) 2017-2019 Jack Kelly
category:            Network
build-type:          Simple
extra-source-files:  COPYING, ChangeLog.md, README.md
tested-with:         GHC == 8.6.5
                   , GHC == 8.6.4
                   , GHC == 8.4.4
                   , GHC == 8.2.2
extra-source-files:  COPYING, CHANGELOG.md, README.md
tested-with:         GHC == 8.10.3
                   , GHC == 8.8.4
                   , GHC == 8.6.5

flag example
  description:         Build the example program


@@ 34,7 33,7 @@ library
                     , Network.Telnet.LibTelnet.Options
                     , Network.Telnet.LibTelnet.Types
  ghc-options:         -Wall
  build-depends:       base >= 4.7 && < 5
  build-depends:       base >= 4.9 && < 4.16
                     , bytestring >= 0.10.6.0 && < 0.11
  pkgconfig-depends:   libtelnet
  default-language:    Haskell2010

A nix/sources.json => nix/sources.json +26 -0
@@ 0,0 1,26 @@
{
    "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/<owner>/<repo>/archive/<rev>.tar.gz"
    },
    "nixpkgs": {
        "branch": "release-20.09",
        "description": "Nix Packages collection",
        "homepage": "",
        "owner": "NixOS",
        "repo": "nixpkgs",
        "rev": "7c06b2145ddc21a20c7f178c3391bdaf8497fae2",
        "sha256": "1a0aaybapbcv39dvji0l138lvwimyr9skx5mz88y65ysf7zvlpwi",
        "type": "tarball",
        "url": "https://github.com/NixOS/nixpkgs/archive/7c06b2145ddc21a20c7f178c3391bdaf8497fae2.tar.gz",
        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
    }
}

A nix/sources.nix => nix/sources.nix +174 -0
@@ 0,0 1,174 @@
# This file has been generated by Niv.

let

  #
  # The fetchers. fetch_<type> fetches specs of type <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 = <nixpkgs> == ./.;
    in
      if builtins.hasAttr "nixpkgs" sources
      then sourcesNixpkgs
      else if hasNixpkgsPath && ! hasThisAsNixpkgsPath then
        import <nixpkgs> {}
      else
        abort
          ''
            Please specify either <nixpkgs> (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); }

M shell.nix => shell.nix +8 -2
@@ 1,10 1,16 @@
{ nixpkgs ? import <nixpkgs> {}, compiler ? "default", doBenchmark ? false }:
{ sources ? import ./nix/sources.nix
, nixpkgsArgs ? {}
, nixpkgs ? import sources.nixpkgs nixpkgsArgs
, compiler ? "default"
, doBenchmark ? false
}:
let
  inherit (nixpkgs) pkgs;
  env = (import ./default.nix { inherit nixpkgs compiler doBenchmark; }).env;
  niv = (import sources.niv {}).niv;
in
  env.overrideAttrs (oldAttrs: {
    buildInputs = with pkgs.haskellPackages; oldAttrs.buildInputs ++ [
      cabal-install ghcid
      cabal-install ghcid niv
    ];
  })

M src/Network/Telnet/LibTelnet.hs => src/Network/Telnet/LibTelnet.hs +0 -1
@@ 96,7 96,6 @@ import qualified Data.ByteString.Char8 as B8
import           Data.Foldable (traverse_)
import           Data.Function (on)
import           Data.List (groupBy)
import           Data.Monoid ((<>))
import           Data.Typeable (Typeable)
import           Foreign (ForeignPtr, Ptr, peek, peekArray, withForeignPtr)
import           Foreign.C.String (castCUCharToChar)