X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=default.nix;h=ae3b2b76bedaade975f60b7e8e961af533b3846b;hb=98de2045a749b25d031b174c940096b4f5406b9d;hp=c32d23f569e6ed47d3058c435958f8ac79c46fd1;hpb=dc10144003f159e8de99c82f4195587fef64cd46;p=perso%2FImmae%2FConfig%2FNix.git diff --git a/default.nix b/default.nix index c32d23f..ae3b2b7 100644 --- a/default.nix +++ b/default.nix @@ -1,28 +1,7 @@ -with import ./libs.nix; -with nixpkgs_unstable; +with import {}; +with import ./libs.nix { nixpkgs = import {}; }; let - stable_nixpkgs = import {}; mypkgs = {}; - postHook = '' - header() { - echo -ne "\033[1;36m" - echo -n "$1" - echo -e "\033[0m" - } - - echoCmd() { - printf "\033[1;34m%s:\033[0m" "$1" - shift - printf ' %q' "$@" - echo - } - ''; - - mypkgs.ledger = (ledger.override { boost = boost166; }).overrideAttrs (_old: - fetchedGithub ./fetched/ledger.json // { - postInstall = ""; - } - ); mypkgs.taskwarrior = taskwarrior.overrideAttrs (old: rec { postInstall = ''${old.postInstall} @@ -41,11 +20,18 @@ let } ); - mypkgs.weboob = pythonPackages.weboob.overrideAttrs (old: rec { - postInstall = ''${old.postInstall or ""} - mkdir -p $out/share/bash-completion/completions/ - cp tools/weboob_bash_completion $out/share/bash-completion/completions/weboob - ''; + mypkgs.weboob = (pythonPackages.weboob.overridePythonAttrs { + setupPyBuildFlags = [ "--no-qt" "--xdg" ]; + }).overrideAttrs (old: rec { + version = "1.5"; + src = fetchurl { + url = "https://git.weboob.org/weboob/weboob/-/archive/${version}/${old.pname}-${version}.tar.gz"; + sha256 = "0l6q5nm5g0zn6gmf809059kddrbds27wgygxsfkqja9blks5vq7z"; + }; + postInstall = ''${old.postInstall or ""} + mkdir -p $out/share/bash-completion/completions/ + cp tools/weboob_bash_completion $out/share/bash-completion/completions/weboob + ''; }); mypkgs.slrn = slrn.overrideAttrs (old: rec { @@ -79,132 +65,47 @@ let mypkgs.weechat = weechat.override { configure = { availablePlugins, ... }: { plugins = with availablePlugins; [ + # Make sure websocket_client is not 0.55.0, it provokes + # regular crashes (python.withPackages (ps: with ps; [websocket_client emoji])) perl + ruby ]; }; }; - buildPerlPackage = perlPackages.buildPerlPackage; - mypkgs.note = buildPerlPackage rec { - name = "note-1.3.26"; - src = fetchurl { - url = "mirror://cpan/authors/id/T/TL/TLINDEN/${name}.tar.gz"; - sha256 = "1h645rnb5vpms48fcyzvp7cwwcbf9k5xq49w2bpniyzzgk2brjrq"; - }; - outputs = ["out" "man"]; - propragatedBuildInputs = [ perlPackages.YAML ]; - meta = with stdenv.lib; { - description = "A perl script for maintaining notes"; - homepage = http://www.daemon.de/NOTE; - license = licenses.gpl3; - maintainers = with maintainers; [ { name = "T.v.Dein"; email = "tlinden@cpan.org"; } ]; - platforms = platforms.unix; - }; + mypkgs.boinctui = callPackage ./pkgs/boinctui {}; + mypkgs.cnagios = callPackage ./pkgs/cnagios { inherit fetchedGithub; }; + mypkgs.duply = callPackage ./pkgs/duply {}; + mypkgs.flrn = callPackage ./pkgs/flrn { + slang = callPackage ./pkgs/slang_1 {}; + inherit fetchedGithub; }; - - mypkgs.terminal_velocity = with python2Packages; buildPythonApplication rec { - pname = "terminal-velocity-git"; - version = "0.2.0"; - - patches = [ - # FIXME: update this patch when version changes - ./patches/terminal_velocity_fix_build.patch - ./patches/terminal_velocity_sort_found_notes.patch - ]; - - propagatedBuildInputs = [ chardet urwid sh pyyaml ]; - buildInputs = [ m2r restructuredtext_lint pygments ]; - - src = fetchPypi { - inherit pname version; - sha256 = "13yrkcmvh5h5fwnai61sbmqkrjyisz08n62pq0ada2lyyqf7g6b9"; - }; + mypkgs.genius = callPackage ./pkgs/genius {}; + mypkgs.mtop = callPackage ./pkgs/mtop {}; + mypkgs.muttprint = callPackage ./pkgs/muttprint {}; + mypkgs.mutt-ics = callPackage ./pkgs/mutt-ics { inherit fetchedGithub; }; + mypkgs.nagios-cli = callPackage ./pkgs/nagios-cli { inherit fetchedGithub; }; + #mypkgs.nagnu = callPackage ./pkgs/nagnu { inherit fetchedGithub; }; + mypkgs.note = callPackage ./pkgs/note {}; + mypkgs.notmuch-python2 = callPackage ./pkgs/notmuch/notmuch-python { pythonPackages = python2Packages; }; + mypkgs.notmuch-python3 = callPackage ./pkgs/notmuch/notmuch-python { pythonPackages = python3Packages; }; + mypkgs.notmuch-vim = callPackage ./pkgs/notmuch/notmuch-vim {}; + mypkgs.pg_activity = callPackage ./pkgs/pg_activity { inherit fetchedGithub; }; + mypkgs.pgloader = callPackage ./pkgs/pgloader { inherit fetchedGithub; }; + mypkgs.telegram-cli = callPackage ./pkgs/telegram-cli { inherit fetchedGithub; }; + mypkgs.telegram-history-dump = callPackage ./pkgs/telegram-history-dump { inherit fetchedGithub; }; + mypkgs.telegramircd = callPackage ./pkgs/telegramircd { + telethon = callPackage ./pkgs/telethon_sync {}; + inherit fetchedGithub; }; + mypkgs.terminal-velocity = callPackage ./pkgs/terminal-velocity {}; + mypkgs.tiv = callPackage ./pkgs/tiv {}; + mypkgs.unicode = callPackage ./pkgs/unicode {}; - mypkgs.mtop = buildPerlPackage rec { - name = "mtop-${version}"; - version = "0.6.6"; - src = fetchurl { - url = "http://downloads.sourceforge.net/project/mtop/mtop/v${version}/mtop-${version}.tar.gz"; - sha256 = "0x0x5300b1j9i0xxk8rsrki0pspyzj2vylhzv8qg3l6j26aw0zrf"; - }; - outputs = ["out"]; - buildInputs = [ perlPackages.DBI perlPackages.DBDmysql perlPackages.Curses ]; - - postInstall = '' - cd "$out" - preConfigure || true - ''; - meta = with stdenv.lib; { - description = "MySQL top (monitor and examine slow queries)"; - homepage = http://mtop.sourceforge.net/; - license = licenses.gpl3; - maintainers = with maintainers; [ { name = "Marc Prewitt"; email = "mprewitt@chelsea.net"; } ]; - platforms = platforms.unix; - }; - }; - - mypkgs.tiv = buildPerlPackage rec { - name = "tiv-${version}"; - version = "2015"; - src = fetchurl { - url = "http://xyne.archlinux.ca/projects/tiv/src/tiv-${version}.tar.xz"; - sha256 = "1vq073v7z7vmcd57lhs4rf4jasji69cpjgkz4dykp94a77p1qq90"; - }; - outputs = ["out"]; - buildInputs = [ perlPackages.PerlMagick ]; - perlPreHookScript = ./hooks/tiv_builder.sh; - perlPreHook = '' - source ${perlPreHookScript} - ''; - installPhase = '' - install -Dm755 tiv "$out/bin/tiv" - ''; - }; - - mypkgs.cnagios = stdenv.mkDerivation (fetchedGithub ./fetched/cnagios.json // rec { - configureFlags = [ - "--with-etc-dir=/etc/cnagios" - "--with-var-dir=/var/lib/naemon" - "--with-nagios-data=4" - ]; - - prePatch = '' - sed -i -e "s/-lcurses/-lncurses/" Makefile.in - ''; - installPhase = '' - install -dm755 $out/share/doc/cnagios - install -Dm644 cnagiosrc $out/share/doc/cnagios/ - install -Dm644 cnagios.help $out/share/doc/cnagios/ - install -Dm644 cnagios.pl $out/share/doc/cnagios/ - install -dm755 $out/bin - install -Dm755 cnagios $out/bin/ - ''; - propagatedBuildInputs = [ perl ncurses ]; - }); - - mypkgs.nagios-cli = python2Packages.buildPythonApplication (fetchedGithub ./fetched/nagios-cli.json); - - mypkgs.pg_activity = with python2Packages; buildPythonApplication (fetchedGithub ./fetched/pg_activity.json // rec { - propagatedBuildInputs = [ psycopg2 psutil ]; - }); - - mypkgs.pgloader = stdenv.mkDerivation (fetchedGithub ./fetched/pgloader.json // rec { - buildInputs = [ sbcl cacert sqlite freetds libzip curl git openssl makeWrapper ]; - LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ sqlite libzip curl git openssl freetds ]; - buildPhase = '' - export PATH=$PATH:$out/bin - export HOME=$TMPDIR - make pgloader - ''; - dontStrip = true; - enableParallelBuilding = false; - installPhase = '' - install -Dm755 build/bin/pgloader "$out/bin/pgloader" - wrapProgram $out/bin/pgloader --prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}" - ''; - }); + mypkgs.cardano = callPackage ./pkgs/crypto/cardano { inherit fetchedGithub; }; + mypkgs.iota-cli-app = callPackage ./pkgs/crypto/iota-cli-app { inherit fetchedGithub; }; + mypkgs.sia = callPackage ./pkgs/crypto/sia {}; mypkgs.pelican = python3Packages.pelican.overrideAttrs(old: fetchedGithub ./fetched/pelican.json // rec { propagatedBuildInputs = old.propagatedBuildInputs ++ [ python3Packages.pyyaml ]; @@ -230,36 +131,43 @@ let } ); - # mypkgs.nagnu = stdenv.mkDerivation (fetchedGithub ./fetched/nagnu.json // rec { - # buildInputs = [ ncurses curl ]; - # installPhase = '' - # mkdir -p $out/bin - # cp nagnu $out/bin - # mkdir -p $out/share/doc/nagnu - # cp nagnu.conf.sample $out/share/doc/nagnu - # mkdir -p $out/share/man/man8 - # cp docs/nagnu.8 $out/share/man/man8 - # ''; - # }); + mypkgs.goaccess = goaccess.overrideAttrs(old: rec { + name = "goaccess-${version}"; + version = "1.3"; + src = fetchurl { + url = "https://tar.goaccess.io/${name}.tar.gz"; + sha256 = "16vv3pj7pbraq173wlxa89jjsd279004j4kgzlrsk1dz4if5qxwc"; + }; + configureFlags = old.configureFlags ++ [ "--enable-tcb=btree" ]; + buildInputs = old.buildInputs ++ [ tokyocabinet bzip2 ]; + }); + + mypkgs.yarn2nix = yarn2nixPackage.yarn2nix; - mastodon = stdenv.mkDerivation (fetchedGithub ./fetched/mastodon.json // rec { + + mypkgs.sc-im = sc-im.overrideAttrs (old: { buildPhase = '' - export GIT_SSL_CAINFO=/etc/ssl/certs/ca-certificates.crt - export SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt + cd src + sed -i Makefile -e 's@\...name.info@.local/state/$(name)info@' + cd .. + '' + old.buildPhase; + }); - bundle install --deployment --without development test - yarn install --pure-lockfile - ''; - installPhase = '' - cp -a . $out - ''; - propagatedBuildInputs = [ - zlib icu libchardet git bundler yarn - protobuf protobufc libidn libpqxx nodejs - imagemagick ffmpeg libxml2 libxslt pkgconfig - autoconf bison libyaml readline ncurses libffi gdbm - jemalloc which postgresql python3 - ]; + mypkgs.lesspipe = lesspipe.overrideAttrs(old: { + configureFlags = (old.configureFlags or []) ++ [ "--yes" ]; + }); + + + mypkgs.dwm = dwm.overrideAttrs(old: rec { + postPatch = '' + cp ${./patches/dwm_config.h} ./config.h + ''; + }); + + mypkgs.nixops = nixops.overrideAttrs (old: { + preConfigure = (old.preConfigure or "") + '' + sed -i -e "/'keyFile'/s/'path'/'string'/" nixops/backends/__init__.py + ''; }); # https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh # https://github.com/NixOS/nixpkgs/blob/master/doc/languages-frameworks @@ -268,13 +176,11 @@ in inherit nix-prefetch-scripts; inherit nix-generate-from-cpan; inherit timewarrior; - inherit sc-im; inherit pal; - inherit duplicity duply; inherit pdftk; inherit googler; inherit jrnl; - inherit apg; + inherit apg pwgen; inherit newsboat; inherit vcsh; inherit xmr-stak; @@ -284,7 +190,7 @@ in inherit abook khard khal; inherit graphicsmagick; inherit youtube-dl; - inherit ncmpc; + inherit ncmpc ncmpcpp; inherit cadaver; inherit mairix notmuch; inherit ctags; @@ -300,9 +206,34 @@ in inherit keybase; inherit bogofilter; inherit mtr; - inherit nixops; - #inherit mastodon; - # todo: lx* ?, unrar, unzip, zeromq? - #inherit nextcloud-client; + inherit urlview; + inherit rr; + inherit nix-zsh-completions; + inherit browsh; + inherit monero; + inherit nextcloud-client; + inherit feh imagemagick; + inherit lftp; + stgit = gitAndTools.stgit; + inherit bundix; + bower2nix = nodePackages.bower2nix; + inherit firefox; + inherit jq; + inherit lzo unzip bzip2 p7zip xz; + # unrar is unfree + inherit tig; #inherit nixos; + inherit emacs26-nox; + inherit highlight sourceHighlight; + pygmentize = python3Packages.pygments; + inherit iftop htop; + inherit fetchmail; + inherit bc; + inherit cpulimit; + inherit dmenu st; + inherit poppler_utils; + inherit tmux; + inherit netcat-gnu; + inherit ledger; + inherit ffmpeg libxslt; }