Unverified Commit fa1c8834 authored by maralorn's avatar maralorn Committed by GitHub
Browse files

Merge pull request #270408 from NixOS/backport-270161-to-release-23.11 

[Backport release-23.11] nix-output-monitor: 2.0.0.7 -> 2.1.1
parents aa769cc9 f0741aa7

pkgs/tools/nix/nix-output-monitor/generated-package.nix

+25 −128
Original line number Diff line number Diff line 
# This file has been autogenerate with cabal2nix.

# Update via ./update.sh"

{

  mkDerivation,

  ansi-terminal,

  async,

  attoparsec,

  base,

  bytestring,

  cassava,

  containers,

  data-default,

  directory,

  extra,

  fetchzip,

  filepath,

  hermes-json,

  HUnit,

  lib,

  lock-file,

  MemoTrie,

  mtl,

  nix-derivation,

  optics,

  random,

  relude,

  safe,

  stm,

  streamly-core,

  strict,

  strict-types,

  terminal-size,

  text,

  time,

  typed-process,

  wcwidth,

  word8,

{ mkDerivation, ansi-terminal, async, attoparsec, base, bytestring

, cassava, containers, data-default, directory, extra, fetchzip

, filepath, hermes-json, HUnit, lib, lock-file, MemoTrie

, nix-derivation, optics, random, relude, safe, stm, streamly-core

, strict, strict-types, terminal-size, text, time, transformers

, typed-process, unix, word8

}:

mkDerivation {

  pname = "nix-output-monitor";

  version = "2.0.0.7";

  version = "2.1.1";

  src = fetchzip {

    url = "https://github.com/maralorn/nix-output-monitor/archive/refs/tags/v2.0.0.7.tar.gz";

    sha256 = "1b2c9kfz80rv2r1s7h6iikyq3bn32h1fv2yq65wkhg3in7qg49jp";

    url = "https://code.maralorn.de/maralorn/nix-output-monitor/archive/v2.1.1.tar.gz";

    sha256 = "1k1gdx7yczz7xm096i8lk09zq6yw1yj8izx6czymfd4qqwj2y49l";

  };

  isLibrary = true;

  isExecutable = true;

  libraryHaskellDepends = [

    ansi-terminal

    async

    attoparsec

    base

    bytestring

    cassava

    containers

    data-default

    directory

    extra

    filepath

    hermes-json

    lock-file

    MemoTrie

    mtl

    nix-derivation

    optics

    relude

    safe

    stm

    streamly-core

    strict

    strict-types

    terminal-size

    text

    time

    wcwidth

    word8

    ansi-terminal async attoparsec base bytestring cassava containers

    data-default directory extra filepath hermes-json lock-file

    MemoTrie nix-derivation optics relude safe stm streamly-core strict

    strict-types terminal-size text time transformers word8

  ];

  executableHaskellDepends = [

    ansi-terminal

    async

    attoparsec

    base

    bytestring

    cassava

    containers

    data-default

    directory

    extra

    filepath

    hermes-json

    lock-file

    MemoTrie

    mtl

    nix-derivation

    optics

    relude

    safe

    stm

    streamly-core

    strict

    strict-types

    terminal-size

    text

    time

    typed-process

    wcwidth

    word8

    ansi-terminal async attoparsec base bytestring cassava containers

    data-default directory extra filepath hermes-json lock-file

    MemoTrie nix-derivation optics relude safe stm streamly-core strict

    strict-types terminal-size text time transformers typed-process

    unix word8

  ];

  testHaskellDepends = [

    ansi-terminal

    async

    attoparsec

    base

    bytestring

    cassava

    containers

    data-default

    directory

    extra

    filepath

    hermes-json

    HUnit

    lock-file

    MemoTrie

    mtl

    nix-derivation

    optics

    random

    relude

    safe

    stm

    streamly-core

    strict

    strict-types

    terminal-size

    text

    time

    typed-process

    wcwidth

    word8

    ansi-terminal async attoparsec base bytestring cassava containers

    data-default directory extra filepath hermes-json HUnit lock-file

    MemoTrie nix-derivation optics random relude safe stm streamly-core

    strict strict-types terminal-size text time transformers

    typed-process word8

  ];

  homepage = "https://github.com/maralorn/nix-output-monitor";

  description = "Parses output of nix-build to show additional information";

  description = "Processes output of Nix commands to show helpful and pretty information";

  license = lib.licenses.agpl3Plus;

  mainProgram = "nom";

  maintainers = [ lib.maintainers.maralorn ];

pkgs/tools/nix/nix-output-monitor/update.sh

+3 −5
Original line number Diff line number Diff line 
#!/usr/bin/env nix-shell

#!nix-shell -i bash -p cabal2nix curl jq alejandra

#!nix-shell -i bash -p cabal2nix curl jq

#

# This script will update the nix-output-monitor derivation to the latest version using

# cabal2nix.
@@ -12,7 +12,7 @@ script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" 
derivation_file="${script_dir}/generated-package.nix"



# This is the latest released version of nix-output-monitor on GitHub.

new_version=$(curl --silent "https://api.github.com/repos/maralorn/nix-output-monitor/releases" | jq '.[0].tag_name' --raw-output)

new_version=$(curl --silent "https://code.maralorn.de/api/v1/repos/maralorn/nix-output-monitor/releases" | jq '.[0].tag_name' --raw-output)



echo "Updating nix-output-monitor to version $new_version."

echo "Running cabal2nix and outputting to ${derivation_file}..."
@@ -24,9 +24,7 @@ EOF 


cabal2nix \

  --maintainer maralorn \

  "https://github.com/maralorn/nix-output-monitor/archive/refs/tags/${new_version}.tar.gz" \

  "https://code.maralorn.de/maralorn/nix-output-monitor/archive/${new_version}.tar.gz" \

  >> "$derivation_file"



alejandra "${derivation_file}" | cat



echo "Finished."