From 776aa3603903616702b8bc1d9e955d3a6da9ee1e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Tue, 31 Jan 2023 00:24:00 +0100 Subject: [PATCH] Add flake skeletons --- default.nix | 12 +- flake.lock | 2037 ++++++++++++ flake.nix | 61 + flakes/etherpad-lite/default.nix | 7 +- flakes/etherpad-lite/etherpad-lite.json | 15 - flakes/etherpad-lite/flake.lock | 70 +- flakes/etherpad-lite/flake.nix | 5 +- flakes/grocy/flake.lock | 70 +- flakes/grocy/flake.nix | 5 +- flakes/lib/flake.nix | 7 - .../mypackages/environments}/default.nix | 0 .../mypackages/environments}/immae-eu.nix | 0 flakes/mypackages/flake.lock | 64 + flakes/mypackages/flake.nix | 37 + flakes/mypackages/lib/default.nix | 4 + flakes/mypackages/lib/flake-parts-lib.nix | 10 + flakes/mypackages/lib/flake.lock | 7 + {lib => flakes/mypackages/lib}/node-env.nix | 0 .../mypackages/lib}/private/default.nix | 0 .../overlays}/bitlbee-discord/default.nix | 0 .../bitlbee/bitlbee_long_nicks.patch | 0 .../mypackages/overlays}/bitlbee/default.nix | 0 .../mypackages/overlays}/bonfire/default.nix | 0 .../overlays}/bugwarrior/default.nix | 0 .../overlays}/bugwarrior/mantisbt.patch | 0 .../mypackages/overlays}/bundix/default.nix | 0 .../overlays}/databases/mysql/default.nix | 0 .../databases/postgresql/default.nix | 0 .../mypackages/overlays}/default.nix | 36 +- .../mypackages/overlays}/doing/default.nix | 0 .../mypackages/overlays}/dwm/default.nix | 0 .../mypackages/overlays}/dwm/dwm_config.h | 0 .../mypackages/overlays}/elinks/default.nix | 0 .../mypackages/overlays}/gitolite/default.nix | 0 .../mypackages/overlays}/gitolite/invite | 0 .../mypackages/overlays}/gitweb/default.nix | 0 .../overlays}/gitweb/theme/git-favicon.png | Bin .../overlays}/gitweb/theme/git-logo.png | Bin .../overlays}/gitweb/theme/gitweb.css | 0 .../overlays}/gitweb/theme/gitweb.js | 0 .../mypackages/overlays}/goaccess/default.nix | 0 .../mypackages/overlays}/kanboard/default.nix | 0 .../mypackages/overlays}/ledger/default.nix | 0 .../mypackages/overlays}/lesspipe/default.nix | 0 .../mypackages/overlays}/morph/default.nix | 0 .../mypackages/overlays}/morph/dry-run.patch | 0 .../overlays}/morph/verbose_nix.patch | 0 .../mypackages/overlays}/neomutt/default.nix | 0 .../mypackages/overlays}/neomutt/tx.patch | 0 .../overlays}/nix-direnv/default.nix | 0 .../mypackages/overlays}/pass/default.nix | 0 .../overlays}/pass/pass-fix-pass-init.patch | 0 .../overlays}/php-packages/default.nix | 0 .../overlays}/php-packages/mysqli_patch.patch | 0 .../mypackages/overlays}/postfix/default.nix | 0 .../overlays}/procps-ng/default.nix | 0 .../overlays}/python-packages/default.nix | 0 .../mypackages/overlays}/slrn/default.nix | 0 .../overlays}/taskwarrior/TW-1778_patch.diff | 0 .../overlays}/taskwarrior/default.nix | 0 .../mypackages/overlays}/urlwatch/default.nix | 0 .../mypackages/overlays}/vcsh/default.nix | 0 .../mypackages/overlays}/weechat/default.nix | 0 flakes/mypackages/overlays/ympd/default.nix | 14 + .../overlays}/ympd/ympd-password-env.patch | 0 .../mypackages/pkgs}/bash-libs/default.nix | 0 .../mypackages/pkgs}/boinctui/default.nix | 0 .../mypackages/pkgs}/cnagios/default.nix | 14 +- .../mypackages/pkgs}/commento/default.nix | 0 .../mypackages/pkgs}/composer-env/default.nix | 6 +- .../pkgs}/crypto/cardano-cli/default.nix | 0 .../pkgs}/crypto/cardano/default.nix | 14 +- .../pkgs}/crypto/iota-cli-app/default.nix | 13 +- .../crypto/iota-cli-app/node-packages.nix | 0 .../mypackages/pkgs}/crypto/sia/default.nix | 0 {pkgs => flakes/mypackages/pkgs}/default.nix | 48 +- .../plugins/deleted_to_trash/default.nix | 13 +- .../plugins/deleted_to_trash/fix_mbox.patch | 0 .../mypackages/pkgs}/flrn/default.nix | 13 +- .../mypackages/pkgs}/fluent-bit/default.nix | 0 .../mypackages/pkgs}/fluentd/Gemfile | 0 .../mypackages/pkgs}/fluentd/Gemfile.lock | 0 .../mypackages/pkgs}/fluentd/default.nix | 0 .../mypackages/pkgs}/fluentd/gemset.nix | 0 .../mypackages/pkgs}/gearmand/default.nix | 0 .../mypackages/pkgs}/genius/default.nix | 0 .../mypackages/pkgs}/ical2html/default.nix | 0 .../pkgs}/monitoring-plugins/default.nix | 0 .../mypackages/pkgs}/mtop/default.nix | 0 flakes/mypackages/pkgs/mutt-ics/default.nix | 15 + .../mypackages/pkgs}/muttprint/0.73-4.diff.gz | Bin .../mypackages/pkgs}/muttprint/default.nix | 0 .../mypackages/pkgs}/muttprint/regex.patch | 0 .../mypackages/pkgs}/muttprint/two_edge.patch | 0 .../pkgs}/naemon-livestatus/default.nix | 13 +- .../mypackages/pkgs}/naemon/default.nix | 13 +- flakes/mypackages/pkgs/nagios-cli/default.nix | 12 + flakes/mypackages/pkgs/nagnu/default.nix | 21 + .../mypackages/pkgs}/nb/default.nix | 0 .../mypackages/pkgs}/note/default.nix | 0 .../pkgs}/notmuch/notmuch-python/default.nix | 0 .../pkgs}/notmuch/notmuch-vim/default.nix | 0 .../pkgs}/perl-ical-parser-html/default.nix | 11 +- .../mypackages/pkgs}/pgpid/default.nix | 0 flakes/mypackages/pkgs/predixy/default.nix | 19 + .../mypackages/pkgs}/proftpd/default.nix | 0 .../mypackages/pkgs}/pure-ftpd/default.nix | 0 .../pkgs}/python-packages/blivet/default.nix | 0 .../python-packages/blivet/fix_path.patch | 0 .../pkgs}/python-packages/blivet/poetry.lock | 0 .../python-packages/blivet/pyproject.toml | 0 .../pkgs}/python-packages/default.nix | 2 +- .../pkgs}/python-packages/matrix-webhook.nix | 0 .../pkgs}/python-packages/pymilter.nix | 0 .../mypackages/pkgs}/riotkit-do/default.nix | 0 .../mypackages/pkgs}/rrsync_sudo/default.nix | 0 .../mypackages/pkgs}/rrsync_sudo/sudo.patch | 0 .../mypackages/pkgs}/shaarli/default.nix | 0 .../pkgs}/shaarli/shaarli_ldap.patch | 0 .../mypackages/pkgs}/signaldctl/default.nix | 0 .../mypackages/pkgs}/slang_1/default.nix | 0 .../pkgs}/status_engine/host_perfdata.patch | 0 .../pkgs}/status_engine/interface.nix | 0 .../status_engine/interface_composer.lock | 0 .../status_engine/interface_php_packages.nix | 0 .../mypackages/pkgs/status_engine/module.nix | 19 + .../mypackages/pkgs}/status_engine/worker.nix | 20 +- .../pkgs}/status_engine/worker_composer.lock | 0 .../status_engine/worker_php_packages.nix | 0 .../pkgs/telegram-history-dump/default.nix | 18 + .../mypackages/pkgs}/telegramircd/default.nix | 10 +- .../pkgs}/telethon_sync/default.nix | 0 .../pkgs}/terminal-velocity/default.nix | 0 .../pkgs}/terminal-velocity/fix_build.patch | 0 .../terminal-velocity/python3_support.patch | 0 .../terminal-velocity/sort_found_notes.patch | 0 .../mypackages/pkgs}/tiv/default.nix | 0 .../mypackages/pkgs}/tiv/tiv_builder.sh | 0 .../mypackages/pkgs}/twins/default.nix | 0 .../mypackages/pkgs}/umami/build-geo.patch | 0 .../mypackages/pkgs}/umami/default.nix | 0 .../mypackages/pkgs}/unicode/default.nix | 0 .../mypackages/pkgs}/upcmd/default.nix | 0 .../pkgs}/webapps/adminer/default.nix | 0 .../pkgs}/webapps/apache-theme/default.nix | 0 .../webapps/apache-theme/theme/.htaccess | 0 .../webapps/apache-theme/theme/footer.html | 0 .../webapps/apache-theme/theme/header.html | 0 .../apache-theme/theme/icons/archive.png | Bin .../apache-theme/theme/icons/audio.png | Bin .../apache-theme/theme/icons/authors.png | Bin .../webapps/apache-theme/theme/icons/bin.png | Bin .../apache-theme/theme/icons/blank.png | Bin .../webapps/apache-theme/theme/icons/bmp.png | Bin .../webapps/apache-theme/theme/icons/c.png | Bin .../webapps/apache-theme/theme/icons/calc.png | Bin .../webapps/apache-theme/theme/icons/cd.png | Bin .../apache-theme/theme/icons/copying.png | Bin .../webapps/apache-theme/theme/icons/cpp.png | Bin .../webapps/apache-theme/theme/icons/css.png | Bin .../webapps/apache-theme/theme/icons/deb.png | Bin .../apache-theme/theme/icons/default.png | Bin .../webapps/apache-theme/theme/icons/diff.png | Bin .../webapps/apache-theme/theme/icons/doc.png | Bin .../webapps/apache-theme/theme/icons/draw.png | Bin .../webapps/apache-theme/theme/icons/eps.png | Bin .../webapps/apache-theme/theme/icons/exe.png | Bin .../apache-theme/theme/icons/folder-home.png | Bin .../apache-theme/theme/icons/folder-open.png | Bin .../apache-theme/theme/icons/folder-page.png | Bin .../theme/icons/folder-parent-old.png | Bin .../theme/icons/folder-parent.png | Bin .../apache-theme/theme/icons/folder.png | Bin .../webapps/apache-theme/theme/icons/gif.png | Bin .../webapps/apache-theme/theme/icons/gzip.png | Bin .../webapps/apache-theme/theme/icons/h.png | Bin .../webapps/apache-theme/theme/icons/hpp.png | Bin .../webapps/apache-theme/theme/icons/html.png | Bin .../webapps/apache-theme/theme/icons/ico.png | Bin .../apache-theme/theme/icons/image.png | Bin .../apache-theme/theme/icons/install.png | Bin .../webapps/apache-theme/theme/icons/java.png | Bin .../webapps/apache-theme/theme/icons/jpg.png | Bin .../webapps/apache-theme/theme/icons/js.png | Bin .../webapps/apache-theme/theme/icons/json.png | Bin .../webapps/apache-theme/theme/icons/log.png | Bin .../apache-theme/theme/icons/makefile.png | Bin .../apache-theme/theme/icons/markdown.png | Bin .../apache-theme/theme/icons/package.png | Bin .../webapps/apache-theme/theme/icons/pdf.png | Bin .../webapps/apache-theme/theme/icons/php.png | Bin .../apache-theme/theme/icons/playlist.png | Bin .../webapps/apache-theme/theme/icons/png.png | Bin .../webapps/apache-theme/theme/icons/pres.png | Bin .../webapps/apache-theme/theme/icons/ps.png | Bin .../webapps/apache-theme/theme/icons/psd.png | Bin .../webapps/apache-theme/theme/icons/py.png | Bin .../webapps/apache-theme/theme/icons/rar.png | Bin .../webapps/apache-theme/theme/icons/rb.png | Bin .../apache-theme/theme/icons/readme.png | Bin .../webapps/apache-theme/theme/icons/rpm.png | Bin .../webapps/apache-theme/theme/icons/rss.png | Bin .../webapps/apache-theme/theme/icons/rtf.png | Bin .../apache-theme/theme/icons/script.png | Bin .../apache-theme/theme/icons/source.png | Bin .../webapps/apache-theme/theme/icons/sql.png | Bin .../webapps/apache-theme/theme/icons/tar.png | Bin .../webapps/apache-theme/theme/icons/tex.png | Bin .../webapps/apache-theme/theme/icons/text.png | Bin .../webapps/apache-theme/theme/icons/tiff.png | Bin .../apache-theme/theme/icons/unknown.png | Bin .../webapps/apache-theme/theme/icons/vcal.png | Bin .../apache-theme/theme/icons/video.png | Bin .../webapps/apache-theme/theme/icons/xml.png | Bin .../webapps/apache-theme/theme/icons/zip.png | Bin .../webapps/apache-theme/theme/style.css | 0 .../mypackages/pkgs}/webapps/awl/default.nix | 0 .../pkgs}/webapps/davical/default.nix | 0 flakes/mypackages/pkgs/webapps/default.nix | 32 + .../pkgs}/webapps/dokuwiki/default.nix | 13 +- .../pkgs}/webapps/dokuwiki/plugins/farmer.nix | 0 .../pkgs}/webapps/dokuwiki/plugins/todo.nix | 0 .../pkgs}/webapps/infcloud/default.nix | 0 .../pkgs}/webapps/infcloud/infcloud_config.js | 0 .../webapps/mantisbt_2/bug_report.php.diff | 0 .../mantisbt_2/bug_report_page.php.diff | 0 .../webapps/mantisbt_2/bugnote_add.php.diff | 0 .../mantisbt_2/bugnote_add_inc.php.diff | 0 .../pkgs}/webapps/mantisbt_2/default.nix | 0 .../mantisbt_2/plugins/slack/default.nix | 0 .../source-integration/Source.API.php.diff | 0 .../plugins/source-integration/default.nix | 0 .../pkgs}/webapps/nextcloud/apps/apporder.nix | 0 .../webapps/nextcloud/apps/audioplayer.nix | 0 .../webapps/nextcloud/apps/bookmarks.nix | 0 .../pkgs}/webapps/nextcloud/apps/calendar.nix | 0 .../pkgs}/webapps/nextcloud/apps/carnet.nix | 0 .../pkgs}/webapps/nextcloud/apps/circles.nix | 0 .../pkgs}/webapps/nextcloud/apps/contacts.nix | 0 .../pkgs}/webapps/nextcloud/apps/cookbook.nix | 0 .../pkgs}/webapps/nextcloud/apps/deck.nix | 0 .../pkgs}/webapps/nextcloud/apps/drawio.nix | 0 .../pkgs}/webapps/nextcloud/apps/external.nix | 0 .../pkgs}/webapps/nextcloud/apps/extract.nix | 0 .../webapps/nextcloud/apps/files_markdown.nix | 0 .../webapps/nextcloud/apps/files_mindmap.nix | 0 .../webapps/nextcloud/apps/files_readmemd.nix | 0 .../webapps/nextcloud/apps/flowupload.nix | 0 .../pkgs}/webapps/nextcloud/apps/gpxedit.nix | 0 .../pkgs}/webapps/nextcloud/apps/gpxpod.nix | 0 .../webapps/nextcloud/apps/groupfolders.nix | 0 .../webapps/nextcloud/apps/impersonate.nix | 0 .../pkgs}/webapps/nextcloud/apps/keeweb.nix | 0 .../pkgs}/webapps/nextcloud/apps/maps.nix | 0 .../pkgs}/webapps/nextcloud/apps/metadata.nix | 0 .../pkgs}/webapps/nextcloud/apps/music.nix | 0 .../pkgs}/webapps/nextcloud/apps/notes.nix | 0 .../pkgs}/webapps/nextcloud/apps/ocsms.nix | 0 .../webapps/nextcloud/apps/onlyoffice.nix | 0 .../pkgs}/webapps/nextcloud/apps/passman.nix | 0 .../pkgs}/webapps/nextcloud/apps/polls.nix | 0 .../pkgs}/webapps/nextcloud/apps/social.nix | 0 .../pkgs}/webapps/nextcloud/apps/spreed.nix | 0 .../nextcloud/apps/talk_matterbridge.nix | 0 .../pkgs}/webapps/nextcloud/apps/tasks.nix | 0 .../pkgs}/webapps/nextcloud/default.nix | 0 .../pkgs}/webapps/phpbb/default.nix | 0 .../webapps/phpbb/extensions/adduser.nix | 0 .../phpbb/extensions/autosubscribe.nix | 0 .../webapps/phpbb/extensions/mailinglist.nix | 0 .../webapps/phpbb/extensions/markdown.nix | 0 .../pkgs}/webapps/phpbb/extensions/mchat.nix | 0 .../phpbb/extensions/monitoranswers.nix | 0 .../pkgs}/webapps/phpbb/langs/fr.nix | 0 .../pkgs}/webapps/phpldapadmin/default.nix | 0 .../phpldapadmin/ldap-align-button.patch | 0 .../phpldapadmin/ldap-fix-password.patch | 0 .../phpldapadmin/ldap-sort-in-templates.patch | 0 .../mypackages/pkgs/webapps/rompr/default.nix | 17 + .../pkgs}/webapps/roundcubemail/add_all.patch | 0 .../pkgs}/webapps/roundcubemail/default.nix | 0 .../plugins/automatic_addressbook/default.nix | 0 .../roundcubemail/plugins/carddav/default.nix | 0 .../plugins/contextmenu/default.nix | 0 .../plugins/contextmenu_folder/default.nix | 0 .../plugins/html5_notifier/default.nix | 0 .../plugins/ident_switch/default.nix | 0 .../plugins/message_highlight/default.nix | 0 .../plugins/thunderbird_labels/default.nix | 0 .../mypackages/pkgs}/webapps/spip/default.nix | 0 .../pkgs}/webapps/spip/spip_ldap_patch.patch | 0 .../pkgs}/webapps/spip/spip_mes_options.php | 0 .../pkgs}/webapps/ttrss/default.nix | 0 .../ttrss/plugins/af_feedmod/default.nix | 18 + .../plugins/af_feedmod/type_replace.patch | 0 .../ttrss/plugins/auth_ldap/default.nix | 17 + .../ttrss/plugins/feediron/default.nix | 18 + .../plugins/feediron/json_reformat.patch | 0 .../ttrss/plugins/ff_instagram/default.nix | 17 + .../ttrss/plugins/tumblr_gdpr_ua/default.nix | 17 + .../pkgs}/webapps/wallabag/default.nix | 0 .../pkgs}/webapps/wallabag/ldap.patch | 0 .../pkgs}/webapps/yourls/default.nix | 15 +- .../webapps/yourls/plugins/ldap/default.nix | 17 + {nix => flakes/mypackages/sources}/README.md | 0 .../mypackages/sources}/sources.json | 3 +- .../mypackages/sources}/sources.nix | 0 .../private/buildbot/common/build_helpers.py | 0 .../private/buildbot/common/libvirt.py | 0 .../private/buildbot/common/master.cfg | 0 flakes/private/buildbot/flake.nix | 4 +- .../buildbot/projects/caldance/__init__.py | 0 .../projects/cryptoportfolio/__init__.py | 0 .../buildbot/projects/denise/__init__.py | 0 .../buildbot/projects/immaeEu/__init__.py | 0 .../projects/immaeEu/scripts/lacells_download | 0 .../buildbot/projects/nicecoop/__init__.py | 0 .../buildbot/projects/test/__init__.py | 0 flakes/private/openarc/flake.lock | 14 +- flakes/private/opendmarc/flake.lock | 14 +- flakes/private/paste/flake.lock | 2 +- flakes/private/peertube/flake.lock | 12 +- flakes/private/peertube/flake.nix | 4 +- flakes/surfer/flake.lock | 70 +- flakes/surfer/flake.nix | 5 +- lib/default.nix | 16 - lib/flake-compat-patched.nix | 190 -- lib/flake-compat.nix | 8 - modules/default.nix | 32 +- modules/private/buildbot/default.nix | 2 +- modules/private/mail/milters.nix | 6 +- modules/private/mail/postfix.nix | 4 +- modules/private/system.nix | 2 +- modules/private/system/backup-2.nix | 4 +- modules/private/system/dilion.nix | 4 +- modules/private/system/eldiron.nix | 4 +- modules/private/system/monitoring-1.nix | 4 +- modules/private/system/quatresaisons.nix | 31 +- .../system/quatresaisons/xdej-backup.sh | 27 + modules/private/tasks/default.nix | 6 +- modules/private/websites/default.nix | 4 +- modules/private/websites/immae/temp.nix | 4 +- .../private/websites/nicecoop/copanier.nix | 9 +- modules/private/websites/syden/peertube.nix | 4 +- .../private/websites/tools/ether/default.nix | 4 +- .../websites/tools/mgoblin/default.nix | 4 +- .../private/websites/tools/tools/default.nix | 8 +- nix | 1 + nixops/default.nix | 1 + overlays/shaarli/default.nix | 3 - overlays/ympd/default.nix | 5 - overlays/ympd/ympd.json | 15 - pkgs/cnagios/cnagios.json | 15 - pkgs/crypto/cardano/daedalus.json | 15 - pkgs/crypto/iota-cli-app/iota-cli-app.json | 15 - .../dovecot-deleted_to_trash.json | 15 - pkgs/flrn/flrn.json | 15 - pkgs/mutt-ics/default.nix | 5 - pkgs/mutt-ics/mutt-ics.json | 15 - pkgs/naemon-livestatus/naemon-livestatus.json | 15 - pkgs/naemon/naemon.json | 15 - pkgs/nagios-cli/default.nix | 2 - pkgs/nagios-cli/nagios-cli.json | 15 - pkgs/nagnu/default.nix | 12 - pkgs/nagnu/nagnu.json | 15 - pkgs/predixy/default.nix | 10 - pkgs/predixy/predixy.json | 15 - pkgs/shaarli/shaarli_ldap.patch | 425 --- pkgs/status_engine/module.json | 15 - pkgs/status_engine/module.nix | 10 - pkgs/status_engine/worker.json | 15 - pkgs/telegram-history-dump/default.nix | 9 - .../telegram-history-dump.json | 15 - pkgs/telegramircd/telegramircd.json | 15 - pkgs/webapps/default.nix | 31 - pkgs/webapps/dokuwiki/dokuwiki.json | 15 - pkgs/webapps/etherpad-lite/default.nix | 63 - pkgs/webapps/etherpad-lite/etherpad-lite.json | 15 - .../etherpad-lite/libreoffice_patch.diff | 12 - .../node-packages.json | 1 - .../ep_aa_file_menu_toolbar/node-packages.nix | 26 - .../modules/ep_adminpads/node-packages.json | 1 - .../modules/ep_adminpads/node-packages.nix | 27 - .../modules/ep_align/node-packages.json | 1 - .../modules/ep_align/node-packages.nix | 26 - .../modules/ep_bookmark/node-packages.json | 1 - .../modules/ep_bookmark/node-packages.nix | 26 - .../ep_clear_formatting/node-packages.json | 1 - .../ep_clear_formatting/node-packages.nix | 25 - .../modules/ep_colors/node-packages.json | 1 - .../modules/ep_colors/node-packages.nix | 25 - .../ep_comments_page/node-packages.json | 1 - .../ep_comments_page/node-packages.nix | 342 -- .../node-packages.json | 1 - .../node-packages.nix | 26 - .../modules/ep_cursortrace/node-packages.json | 1 - .../modules/ep_cursortrace/node-packages.nix | 26 - .../ep_delete_empty_pads/node-packages.json | 1 - .../ep_delete_empty_pads/node-packages.nix | 26 - .../modules/ep_embedmedia/fix.patch | 85 - .../modules/ep_embedmedia/node-packages.json | 1 - .../modules/ep_embedmedia/node-packages.nix | 29 - .../modules/ep_font_family/node-packages.json | 1 - .../modules/ep_font_family/node-packages.nix | 27 - .../modules/ep_font_size/node-packages.json | 1 - .../modules/ep_font_size/node-packages.nix | 27 - .../modules/ep_headings2/node-packages.json | 1 - .../modules/ep_headings2/node-packages.nix | 26 - .../modules/ep_immae_buttons/ep.json | 13 - .../modules/ep_immae_buttons/hooks.js | 6 - .../ep_immae_buttons/node-packages.nix | 22 - .../modules/ep_immae_buttons/package.json | 10 - .../ep_immae_buttons/static/js/main.js | 67 - .../templates/editbarButtons.ejs | 12 - .../modules/ep_ldapauth/node-packages.json | 1 - .../modules/ep_ldapauth/node-packages.nix | 392 --- .../modules/ep_line_height/fix.patch | 30 - .../modules/ep_line_height/node-packages.json | 1 - .../modules/ep_line_height/node-packages.nix | 28 - .../modules/ep_markdown/node-packages.json | 1 - .../modules/ep_markdown/node-packages.nix | 300 -- .../modules/ep_mypads/fix_ldap.patch | 59 - .../modules/ep_mypads/node-packages.json | 1 - .../modules/ep_mypads/node-packages.nix | 2156 ------------ .../modules/ep_page_view/node-packages.json | 1 - .../modules/ep_page_view/node-packages.nix | 26 - .../ep_previewimages/node-packages.json | 1 - .../ep_previewimages/node-packages.nix | 26 - .../modules/ep_private_pad/node-packages.json | 1 - .../modules/ep_private_pad/node-packages.nix | 2056 ------------ .../modules/ep_ruler/node-packages.json | 1 - .../modules/ep_ruler/node-packages.nix | 27 - .../modules/ep_scrollto/node-packages.json | 1 - .../modules/ep_scrollto/node-packages.nix | 29 - .../ep_set_title_on_pad/node-packages.json | 1 - .../ep_set_title_on_pad/node-packages.nix | 26 - .../ep_subscript_and_superscript/font.patch | 22 - .../node-packages.json | 1 - .../node-packages.nix | 28 - .../ep_timesliderdiff/node-packages.json | 1 - .../ep_timesliderdiff/node-packages.nix | 26 - pkgs/webapps/etherpad-lite/node-packages.nix | 2934 ----------------- pkgs/webapps/rompr/default.nix | 8 - pkgs/webapps/rompr/rompr.json | 15 - .../ttrss/plugins/af_feedmod/af_feedmod.json | 15 - .../ttrss/plugins/af_feedmod/default.nix | 9 - .../ttrss/plugins/auth_ldap/auth-ldap.json | 15 - .../ttrss/plugins/auth_ldap/default.nix | 8 - .../ttrss/plugins/feediron/default.nix | 9 - .../ttrss/plugins/feediron/feediron.json | 15 - .../ttrss/plugins/ff_instagram/default.nix | 8 - .../plugins/ff_instagram/ff_instagram.json | 15 - .../ttrss/plugins/tumblr_gdpr_ua/default.nix | 8 - .../tumblr_gdpr_ua/tumblr_gdpr_ua.json | 15 - pkgs/webapps/yourls/plugins/ldap/default.nix | 8 - pkgs/webapps/yourls/plugins/ldap/ldap.json | 15 - pkgs/webapps/yourls/yourls.json | 15 - shell.nix | 2 +- 458 files changed, 3027 insertions(+), 10543 deletions(-) create mode 100644 flake.lock create mode 100644 flake.nix delete mode 100644 flakes/etherpad-lite/etherpad-lite.json rename {environments => flakes/mypackages/environments}/default.nix (100%) rename {environments => flakes/mypackages/environments}/immae-eu.nix (100%) create mode 100644 flakes/mypackages/flake.lock create mode 100644 flakes/mypackages/flake.nix create mode 100644 flakes/mypackages/lib/default.nix create mode 100644 flakes/mypackages/lib/flake-parts-lib.nix create mode 100644 flakes/mypackages/lib/flake.lock rename {lib => flakes/mypackages/lib}/node-env.nix (100%) rename {lib => flakes/mypackages/lib}/private/default.nix (100%) rename {overlays => flakes/mypackages/overlays}/bitlbee-discord/default.nix (100%) rename {overlays => flakes/mypackages/overlays}/bitlbee/bitlbee_long_nicks.patch (100%) rename {overlays => flakes/mypackages/overlays}/bitlbee/default.nix (100%) rename {overlays => flakes/mypackages/overlays}/bonfire/default.nix (100%) rename {overlays => flakes/mypackages/overlays}/bugwarrior/default.nix (100%) rename {overlays => flakes/mypackages/overlays}/bugwarrior/mantisbt.patch (100%) rename {overlays => flakes/mypackages/overlays}/bundix/default.nix (100%) rename {overlays => flakes/mypackages/overlays}/databases/mysql/default.nix (100%) rename {overlays => flakes/mypackages/overlays}/databases/postgresql/default.nix (100%) rename {overlays => flakes/mypackages/overlays}/default.nix (59%) rename {overlays => flakes/mypackages/overlays}/doing/default.nix (100%) rename {overlays => flakes/mypackages/overlays}/dwm/default.nix (100%) rename {overlays => flakes/mypackages/overlays}/dwm/dwm_config.h (100%) rename {overlays => flakes/mypackages/overlays}/elinks/default.nix (100%) rename {overlays => flakes/mypackages/overlays}/gitolite/default.nix (100%) rename {overlays => flakes/mypackages/overlays}/gitolite/invite (100%) rename {overlays => flakes/mypackages/overlays}/gitweb/default.nix (100%) rename {overlays => flakes/mypackages/overlays}/gitweb/theme/git-favicon.png (100%) rename {overlays => flakes/mypackages/overlays}/gitweb/theme/git-logo.png (100%) rename {overlays => flakes/mypackages/overlays}/gitweb/theme/gitweb.css (100%) rename {overlays => flakes/mypackages/overlays}/gitweb/theme/gitweb.js (100%) rename {overlays => flakes/mypackages/overlays}/goaccess/default.nix (100%) rename {overlays => flakes/mypackages/overlays}/kanboard/default.nix (100%) rename {overlays => flakes/mypackages/overlays}/ledger/default.nix (100%) rename {overlays => flakes/mypackages/overlays}/lesspipe/default.nix (100%) rename {overlays => flakes/mypackages/overlays}/morph/default.nix (100%) rename {overlays => flakes/mypackages/overlays}/morph/dry-run.patch (100%) rename {overlays => flakes/mypackages/overlays}/morph/verbose_nix.patch (100%) rename {overlays => flakes/mypackages/overlays}/neomutt/default.nix (100%) rename {overlays => flakes/mypackages/overlays}/neomutt/tx.patch (100%) rename {overlays => flakes/mypackages/overlays}/nix-direnv/default.nix (100%) rename {overlays => flakes/mypackages/overlays}/pass/default.nix (100%) rename {overlays => flakes/mypackages/overlays}/pass/pass-fix-pass-init.patch (100%) rename {overlays => flakes/mypackages/overlays}/php-packages/default.nix (100%) rename {overlays => flakes/mypackages/overlays}/php-packages/mysqli_patch.patch (100%) rename {overlays => flakes/mypackages/overlays}/postfix/default.nix (100%) rename {overlays => flakes/mypackages/overlays}/procps-ng/default.nix (100%) rename {overlays => flakes/mypackages/overlays}/python-packages/default.nix (100%) rename {overlays => flakes/mypackages/overlays}/slrn/default.nix (100%) rename {overlays => flakes/mypackages/overlays}/taskwarrior/TW-1778_patch.diff (100%) rename {overlays => flakes/mypackages/overlays}/taskwarrior/default.nix (100%) rename {overlays => flakes/mypackages/overlays}/urlwatch/default.nix (100%) rename {overlays => flakes/mypackages/overlays}/vcsh/default.nix (100%) rename {overlays => flakes/mypackages/overlays}/weechat/default.nix (100%) create mode 100644 flakes/mypackages/overlays/ympd/default.nix rename {overlays => flakes/mypackages/overlays}/ympd/ympd-password-env.patch (100%) rename {pkgs => flakes/mypackages/pkgs}/bash-libs/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/boinctui/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/cnagios/default.nix (60%) rename {pkgs => flakes/mypackages/pkgs}/commento/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/composer-env/default.nix (98%) rename {pkgs => flakes/mypackages/pkgs}/crypto/cardano-cli/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/crypto/cardano/default.nix (68%) rename {pkgs => flakes/mypackages/pkgs}/crypto/iota-cli-app/default.nix (54%) rename {pkgs => flakes/mypackages/pkgs}/crypto/iota-cli-app/node-packages.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/crypto/sia/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/default.nix (58%) rename {pkgs => flakes/mypackages/pkgs}/dovecot/plugins/deleted_to_trash/default.nix (58%) rename {pkgs => flakes/mypackages/pkgs}/dovecot/plugins/deleted_to_trash/fix_mbox.patch (100%) rename {pkgs => flakes/mypackages/pkgs}/flrn/default.nix (57%) rename {pkgs => flakes/mypackages/pkgs}/fluent-bit/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/fluentd/Gemfile (100%) rename {pkgs => flakes/mypackages/pkgs}/fluentd/Gemfile.lock (100%) rename {pkgs => flakes/mypackages/pkgs}/fluentd/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/fluentd/gemset.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/gearmand/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/genius/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/ical2html/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/monitoring-plugins/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/mtop/default.nix (100%) create mode 100644 flakes/mypackages/pkgs/mutt-ics/default.nix rename {pkgs => flakes/mypackages/pkgs}/muttprint/0.73-4.diff.gz (100%) rename {pkgs => flakes/mypackages/pkgs}/muttprint/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/muttprint/regex.patch (100%) rename {pkgs => flakes/mypackages/pkgs}/muttprint/two_edge.patch (100%) rename {pkgs => flakes/mypackages/pkgs}/naemon-livestatus/default.nix (56%) rename {pkgs => flakes/mypackages/pkgs}/naemon/default.nix (70%) create mode 100644 flakes/mypackages/pkgs/nagios-cli/default.nix create mode 100644 flakes/mypackages/pkgs/nagnu/default.nix rename {pkgs => flakes/mypackages/pkgs}/nb/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/note/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/notmuch/notmuch-python/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/notmuch/notmuch-vim/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/perl-ical-parser-html/default.nix (84%) rename {pkgs => flakes/mypackages/pkgs}/pgpid/default.nix (100%) create mode 100644 flakes/mypackages/pkgs/predixy/default.nix rename {pkgs => flakes/mypackages/pkgs}/proftpd/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/pure-ftpd/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/python-packages/blivet/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/python-packages/blivet/fix_path.patch (100%) rename {pkgs => flakes/mypackages/pkgs}/python-packages/blivet/poetry.lock (100%) rename {pkgs => flakes/mypackages/pkgs}/python-packages/blivet/pyproject.toml (100%) rename {pkgs => flakes/mypackages/pkgs}/python-packages/default.nix (88%) rename {pkgs => flakes/mypackages/pkgs}/python-packages/matrix-webhook.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/python-packages/pymilter.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/riotkit-do/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/rrsync_sudo/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/rrsync_sudo/sudo.patch (100%) rename {pkgs => flakes/mypackages/pkgs}/shaarli/default.nix (100%) rename {overlays => flakes/mypackages/pkgs}/shaarli/shaarli_ldap.patch (100%) rename {pkgs => flakes/mypackages/pkgs}/signaldctl/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/slang_1/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/status_engine/host_perfdata.patch (100%) rename {pkgs => flakes/mypackages/pkgs}/status_engine/interface.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/status_engine/interface_composer.lock (100%) rename {pkgs => flakes/mypackages/pkgs}/status_engine/interface_php_packages.nix (100%) create mode 100644 flakes/mypackages/pkgs/status_engine/module.nix rename {pkgs => flakes/mypackages/pkgs}/status_engine/worker.nix (54%) rename {pkgs => flakes/mypackages/pkgs}/status_engine/worker_composer.lock (100%) rename {pkgs => flakes/mypackages/pkgs}/status_engine/worker_php_packages.nix (100%) create mode 100644 flakes/mypackages/pkgs/telegram-history-dump/default.nix rename {pkgs => flakes/mypackages/pkgs}/telegramircd/default.nix (62%) rename {pkgs => flakes/mypackages/pkgs}/telethon_sync/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/terminal-velocity/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/terminal-velocity/fix_build.patch (100%) rename {pkgs => flakes/mypackages/pkgs}/terminal-velocity/python3_support.patch (100%) rename {pkgs => flakes/mypackages/pkgs}/terminal-velocity/sort_found_notes.patch (100%) rename {pkgs => flakes/mypackages/pkgs}/tiv/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/tiv/tiv_builder.sh (100%) rename {pkgs => flakes/mypackages/pkgs}/twins/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/umami/build-geo.patch (100%) rename {pkgs => flakes/mypackages/pkgs}/umami/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/unicode/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/upcmd/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/adminer/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/.htaccess (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/footer.html (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/header.html (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/archive.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/audio.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/authors.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/bin.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/blank.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/bmp.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/c.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/calc.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/cd.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/copying.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/cpp.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/css.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/deb.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/default.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/diff.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/doc.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/draw.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/eps.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/exe.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/folder-home.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/folder-open.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/folder-page.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/folder-parent-old.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/folder-parent.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/folder.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/gif.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/gzip.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/h.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/hpp.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/html.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/ico.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/image.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/install.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/java.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/jpg.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/js.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/json.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/log.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/makefile.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/markdown.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/package.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/pdf.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/php.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/playlist.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/png.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/pres.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/ps.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/psd.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/py.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/rar.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/rb.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/readme.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/rpm.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/rss.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/rtf.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/script.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/source.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/sql.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/tar.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/tex.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/text.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/tiff.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/unknown.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/vcal.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/video.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/xml.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/icons/zip.png (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/apache-theme/theme/style.css (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/awl/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/davical/default.nix (100%) create mode 100644 flakes/mypackages/pkgs/webapps/default.nix rename {pkgs => flakes/mypackages/pkgs}/webapps/dokuwiki/default.nix (79%) rename {pkgs => flakes/mypackages/pkgs}/webapps/dokuwiki/plugins/farmer.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/dokuwiki/plugins/todo.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/infcloud/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/infcloud/infcloud_config.js (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/mantisbt_2/bug_report.php.diff (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/mantisbt_2/bug_report_page.php.diff (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/mantisbt_2/bugnote_add.php.diff (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/mantisbt_2/bugnote_add_inc.php.diff (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/mantisbt_2/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/mantisbt_2/plugins/slack/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/mantisbt_2/plugins/source-integration/Source.API.php.diff (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/mantisbt_2/plugins/source-integration/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/nextcloud/apps/apporder.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/nextcloud/apps/audioplayer.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/nextcloud/apps/bookmarks.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/nextcloud/apps/calendar.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/nextcloud/apps/carnet.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/nextcloud/apps/circles.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/nextcloud/apps/contacts.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/nextcloud/apps/cookbook.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/nextcloud/apps/deck.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/nextcloud/apps/drawio.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/nextcloud/apps/external.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/nextcloud/apps/extract.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/nextcloud/apps/files_markdown.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/nextcloud/apps/files_mindmap.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/nextcloud/apps/files_readmemd.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/nextcloud/apps/flowupload.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/nextcloud/apps/gpxedit.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/nextcloud/apps/gpxpod.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/nextcloud/apps/groupfolders.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/nextcloud/apps/impersonate.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/nextcloud/apps/keeweb.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/nextcloud/apps/maps.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/nextcloud/apps/metadata.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/nextcloud/apps/music.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/nextcloud/apps/notes.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/nextcloud/apps/ocsms.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/nextcloud/apps/onlyoffice.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/nextcloud/apps/passman.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/nextcloud/apps/polls.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/nextcloud/apps/social.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/nextcloud/apps/spreed.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/nextcloud/apps/talk_matterbridge.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/nextcloud/apps/tasks.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/nextcloud/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/phpbb/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/phpbb/extensions/adduser.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/phpbb/extensions/autosubscribe.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/phpbb/extensions/mailinglist.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/phpbb/extensions/markdown.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/phpbb/extensions/mchat.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/phpbb/extensions/monitoranswers.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/phpbb/langs/fr.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/phpldapadmin/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/phpldapadmin/ldap-align-button.patch (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/phpldapadmin/ldap-fix-password.patch (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/phpldapadmin/ldap-sort-in-templates.patch (100%) create mode 100644 flakes/mypackages/pkgs/webapps/rompr/default.nix rename {pkgs => flakes/mypackages/pkgs}/webapps/roundcubemail/add_all.patch (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/roundcubemail/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/roundcubemail/plugins/automatic_addressbook/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/roundcubemail/plugins/carddav/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/roundcubemail/plugins/contextmenu/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/roundcubemail/plugins/contextmenu_folder/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/roundcubemail/plugins/html5_notifier/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/roundcubemail/plugins/ident_switch/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/roundcubemail/plugins/message_highlight/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/roundcubemail/plugins/thunderbird_labels/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/spip/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/spip/spip_ldap_patch.patch (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/spip/spip_mes_options.php (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/ttrss/default.nix (100%) create mode 100644 flakes/mypackages/pkgs/webapps/ttrss/plugins/af_feedmod/default.nix rename {pkgs => flakes/mypackages/pkgs}/webapps/ttrss/plugins/af_feedmod/type_replace.patch (100%) create mode 100644 flakes/mypackages/pkgs/webapps/ttrss/plugins/auth_ldap/default.nix create mode 100644 flakes/mypackages/pkgs/webapps/ttrss/plugins/feediron/default.nix rename {pkgs => flakes/mypackages/pkgs}/webapps/ttrss/plugins/feediron/json_reformat.patch (100%) create mode 100644 flakes/mypackages/pkgs/webapps/ttrss/plugins/ff_instagram/default.nix create mode 100644 flakes/mypackages/pkgs/webapps/ttrss/plugins/tumblr_gdpr_ua/default.nix rename {pkgs => flakes/mypackages/pkgs}/webapps/wallabag/default.nix (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/wallabag/ldap.patch (100%) rename {pkgs => flakes/mypackages/pkgs}/webapps/yourls/default.nix (63%) create mode 100644 flakes/mypackages/pkgs/webapps/yourls/plugins/ldap/default.nix rename {nix => flakes/mypackages/sources}/README.md (100%) rename {nix => flakes/mypackages/sources}/sources.json (97%) rename {nix => flakes/mypackages/sources}/sources.nix (100%) rename {modules => flakes}/private/buildbot/common/build_helpers.py (100%) rename {modules => flakes}/private/buildbot/common/libvirt.py (100%) rename {modules => flakes}/private/buildbot/common/master.cfg (100%) rename {modules => flakes}/private/buildbot/projects/caldance/__init__.py (100%) rename {modules => flakes}/private/buildbot/projects/cryptoportfolio/__init__.py (100%) rename {modules => flakes}/private/buildbot/projects/denise/__init__.py (100%) rename {modules => flakes}/private/buildbot/projects/immaeEu/__init__.py (100%) rename {modules => flakes}/private/buildbot/projects/immaeEu/scripts/lacells_download (100%) rename {modules => flakes}/private/buildbot/projects/nicecoop/__init__.py (100%) rename {modules => flakes}/private/buildbot/projects/test/__init__.py (100%) delete mode 100644 lib/default.nix delete mode 100644 lib/flake-compat-patched.nix delete mode 100644 lib/flake-compat.nix create mode 100755 modules/private/system/quatresaisons/xdej-backup.sh create mode 120000 nix delete mode 100644 overlays/shaarli/default.nix delete mode 100644 overlays/ympd/default.nix delete mode 100644 overlays/ympd/ympd.json delete mode 100644 pkgs/cnagios/cnagios.json delete mode 100644 pkgs/crypto/cardano/daedalus.json delete mode 100644 pkgs/crypto/iota-cli-app/iota-cli-app.json delete mode 100644 pkgs/dovecot/plugins/deleted_to_trash/dovecot-deleted_to_trash.json delete mode 100644 pkgs/flrn/flrn.json delete mode 100644 pkgs/mutt-ics/default.nix delete mode 100644 pkgs/mutt-ics/mutt-ics.json delete mode 100644 pkgs/naemon-livestatus/naemon-livestatus.json delete mode 100644 pkgs/naemon/naemon.json delete mode 100644 pkgs/nagios-cli/default.nix delete mode 100644 pkgs/nagios-cli/nagios-cli.json delete mode 100644 pkgs/nagnu/default.nix delete mode 100644 pkgs/nagnu/nagnu.json delete mode 100644 pkgs/predixy/default.nix delete mode 100644 pkgs/predixy/predixy.json delete mode 100644 pkgs/shaarli/shaarli_ldap.patch delete mode 100644 pkgs/status_engine/module.json delete mode 100644 pkgs/status_engine/module.nix delete mode 100644 pkgs/status_engine/worker.json delete mode 100644 pkgs/telegram-history-dump/default.nix delete mode 100644 pkgs/telegram-history-dump/telegram-history-dump.json delete mode 100644 pkgs/telegramircd/telegramircd.json delete mode 100644 pkgs/webapps/default.nix delete mode 100644 pkgs/webapps/dokuwiki/dokuwiki.json delete mode 100644 pkgs/webapps/etherpad-lite/default.nix delete mode 100644 pkgs/webapps/etherpad-lite/etherpad-lite.json delete mode 100644 pkgs/webapps/etherpad-lite/libreoffice_patch.diff delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_aa_file_menu_toolbar/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_aa_file_menu_toolbar/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_adminpads/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_adminpads/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_align/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_align/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_bookmark/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_bookmark/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_clear_formatting/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_clear_formatting/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_colors/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_colors/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_comments_page/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_comments_page/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_copy_paste_select_all/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_copy_paste_select_all/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_cursortrace/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_cursortrace/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_delete_empty_pads/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_delete_empty_pads/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_embedmedia/fix.patch delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_embedmedia/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_embedmedia/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_font_family/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_font_family/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_font_size/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_font_size/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_headings2/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_headings2/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_immae_buttons/ep.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_immae_buttons/hooks.js delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_immae_buttons/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_immae_buttons/package.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_immae_buttons/static/js/main.js delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_immae_buttons/templates/editbarButtons.ejs delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_ldapauth/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_ldapauth/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_line_height/fix.patch delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_line_height/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_line_height/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_markdown/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_markdown/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_mypads/fix_ldap.patch delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_mypads/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_mypads/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_page_view/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_page_view/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_previewimages/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_previewimages/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_private_pad/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_private_pad/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_ruler/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_ruler/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_scrollto/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_scrollto/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_set_title_on_pad/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_set_title_on_pad/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_subscript_and_superscript/font.patch delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_subscript_and_superscript/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_subscript_and_superscript/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_timesliderdiff/node-packages.json delete mode 100644 pkgs/webapps/etherpad-lite/modules/ep_timesliderdiff/node-packages.nix delete mode 100644 pkgs/webapps/etherpad-lite/node-packages.nix delete mode 100644 pkgs/webapps/rompr/default.nix delete mode 100644 pkgs/webapps/rompr/rompr.json delete mode 100644 pkgs/webapps/ttrss/plugins/af_feedmod/af_feedmod.json delete mode 100644 pkgs/webapps/ttrss/plugins/af_feedmod/default.nix delete mode 100644 pkgs/webapps/ttrss/plugins/auth_ldap/auth-ldap.json delete mode 100644 pkgs/webapps/ttrss/plugins/auth_ldap/default.nix delete mode 100644 pkgs/webapps/ttrss/plugins/feediron/default.nix delete mode 100644 pkgs/webapps/ttrss/plugins/feediron/feediron.json delete mode 100644 pkgs/webapps/ttrss/plugins/ff_instagram/default.nix delete mode 100644 pkgs/webapps/ttrss/plugins/ff_instagram/ff_instagram.json delete mode 100644 pkgs/webapps/ttrss/plugins/tumblr_gdpr_ua/default.nix delete mode 100644 pkgs/webapps/ttrss/plugins/tumblr_gdpr_ua/tumblr_gdpr_ua.json delete mode 100644 pkgs/webapps/yourls/plugins/ldap/default.nix delete mode 100644 pkgs/webapps/yourls/plugins/ldap/ldap.json delete mode 100644 pkgs/webapps/yourls/yourls.json diff --git a/default.nix b/default.nix index 1f43cdd..0765c02 100644 --- a/default.nix +++ b/default.nix @@ -1,11 +1,13 @@ -{ sources ? import ./nix/sources.nix, pkgs ? import sources.nixpkgs {} }: +{ sources ? import ./nix/sources.nix, pkgs ? import sources.nixpkgs-nixops { overlays = []; } }: let - mypkgs = pkgs.callPackage ./pkgs {}; + mylibs = import ./flakes/mypackages/lib; + environments = pkgs.callPackage ./flakes/mypackages/environments {}; + mypkgs = pkgs.callPackage ./flakes/mypackages/pkgs { inherit mylibs sources environments; }; in { - lib = pkgs.callPackage ./lib {}; + lib = mylibs; modules = import ./modules; - overlays = import ./overlays; + overlays = import ./flakes/mypackages/overlays { inherit mypkgs sources mylibs; }; pkgs = mypkgs; - environments = pkgs.callPackage ./environments {}; + inherit environments; } // mypkgs diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..ce91e88 --- /dev/null +++ b/flake.lock @@ -0,0 +1,2037 @@ +{ + "nodes": { + "buildslist": { + "flake": false, + "locked": { + "lastModified": 1585697026, + "narHash": "sha256-7CO89q6Bmg59eN5tFGYaqJR/rpJrLu7dpulXgJUv/0E=", + "ref": "master", + "rev": "fb8641f2badcec9f232cc5f727009911fc1c89b0", + "revCount": 4, + "type": "git", + "url": "https://git.immae.eu/perso/Immae/Projets/Buildbot/buildslist" + }, + "original": { + "type": "git", + "url": "https://git.immae.eu/perso/Immae/Projets/Buildbot/buildslist" + } + }, + "copanier": { + "flake": false, + "locked": { + "lastModified": 1633895178, + "narHash": "sha256-0xrh12eBSVpgVeniSbKQAuGBhIyVB/rB/H3Tt7EJ1vQ=", + "owner": "spiral-project", + "repo": "copanier", + "rev": "d1b92cc639f4d25ad31baf4a6579a33c44a0d837", + "type": "github" + }, + "original": { + "owner": "spiral-project", + "repo": "copanier", + "type": "github" + } + }, + "diaspora": { + "flake": false, + "locked": { + "lastModified": 1551139311, + "narHash": "sha256-Fyv7Af68YccJL2OGz6l9d71UmnLB+LstlWbOlgFZtgo=", + "owner": "diaspora", + "repo": "diaspora", + "rev": "663da1ef2573863eb870e0edbd50050f261f3d30", + "type": "github" + }, + "original": { + "owner": "diaspora", + "ref": "v0.7.10.0", + "repo": "diaspora", + "type": "github" + } + }, + "etherpad-lite": { + "flake": false, + "locked": { + "lastModified": 1587951095, + "narHash": "sha256-PjAkvkC7tJzRECUqOvuWfoZTz8QqDXk6oXEN3ig24rQ=", + "owner": "ether", + "repo": "etherpad-lite", + "rev": "62101147a0c3495dc80daa87ab53a3366321a205", + "type": "github" + }, + "original": { + "owner": "ether", + "ref": "1.8.3", + "repo": "etherpad-lite", + "type": "github" + } + }, + "files-watcher": { + "locked": { + "narHash": "sha256-6urOJuzXsu4HJHyVmrZHd40SMzzTeHiOiDOM40q53Y0=", + "path": "../../files-watcher", + "type": "path" + }, + "original": { + "path": "../../files-watcher", + "type": "path" + } + }, + "files-watcher_2": { + "locked": { + "narHash": "sha256-6urOJuzXsu4HJHyVmrZHd40SMzzTeHiOiDOM40q53Y0=", + "path": "../../files-watcher", + "type": "path" + }, + "original": { + "path": "../../files-watcher", + "type": "path" + } + }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1675295133, + "narHash": "sha256-dU8fuLL98WFXG0VnRgM00bqKX6CEPBLybhiIDIgO45o=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "bf53492df08f3178ce85e0c9df8ed8d03c030c9f", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_2" + }, + "locked": { + "lastModified": 1675295133, + "narHash": "sha256-dU8fuLL98WFXG0VnRgM00bqKX6CEPBLybhiIDIgO45o=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "bf53492df08f3178ce85e0c9df8ed8d03c030c9f", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_3" + }, + "locked": { + "lastModified": 1675295133, + "narHash": "sha256-dU8fuLL98WFXG0VnRgM00bqKX6CEPBLybhiIDIgO45o=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "bf53492df08f3178ce85e0c9df8ed8d03c030c9f", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_4": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_4" + }, + "locked": { + "lastModified": 1675295133, + "narHash": "sha256-dU8fuLL98WFXG0VnRgM00bqKX6CEPBLybhiIDIgO45o=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "bf53492df08f3178ce85e0c9df8ed8d03c030c9f", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_5": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_5" + }, + "locked": { + "lastModified": 1675295133, + "narHash": "sha256-dU8fuLL98WFXG0VnRgM00bqKX6CEPBLybhiIDIgO45o=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "bf53492df08f3178ce85e0c9df8ed8d03c030c9f", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-utils": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_10": { + "locked": { + "lastModified": 1631561581, + "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_11": { + "locked": { + "lastModified": 1610051610, + "narHash": "sha256-U9rPz/usA1/Aohhk7Cmc2gBrEEKRzcW4nwPWMPwja4Y=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3982c9903e93927c2164caa727cd3f6a0e6d14cc", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_12": { + "locked": { + "lastModified": 1648297722, + "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_13": { + "locked": { + "lastModified": 1609246779, + "narHash": "sha256-eq6ZXE/VWo3EMC65jmIT6H/rrUc9UWOWVujkzav025k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "08c7ad4a0844adc4a7f9f5bb3beae482e789afa4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_14": { + "locked": { + "lastModified": 1609246779, + "narHash": "sha256-eq6ZXE/VWo3EMC65jmIT6H/rrUc9UWOWVujkzav025k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "08c7ad4a0844adc4a7f9f5bb3beae482e789afa4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_15": { + "locked": { + "lastModified": 1631561581, + "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_16": { + "locked": { + "lastModified": 1610051610, + "narHash": "sha256-U9rPz/usA1/Aohhk7Cmc2gBrEEKRzcW4nwPWMPwja4Y=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3982c9903e93927c2164caa727cd3f6a0e6d14cc", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_17": { + "locked": { + "lastModified": 1610051610, + "narHash": "sha256-U9rPz/usA1/Aohhk7Cmc2gBrEEKRzcW4nwPWMPwja4Y=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "3982c9903e93927c2164caa727cd3f6a0e6d14cc", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_18": { + "locked": { + "lastModified": 1648297722, + "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_19": { + "locked": { + "lastModified": 1648297722, + "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "locked": { + "lastModified": 1631561581, + "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_20": { + "locked": { + "lastModified": 1648297722, + "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "locked": { + "lastModified": 1648297722, + "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "locked": { + "lastModified": 1648297722, + "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_5": { + "locked": { + "lastModified": 1648297722, + "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_6": { + "locked": { + "lastModified": 1648297722, + "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_7": { + "locked": { + "lastModified": 1649676176, + "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_8": { + "locked": { + "lastModified": 1609246779, + "narHash": "sha256-eq6ZXE/VWo3EMC65jmIT6H/rrUc9UWOWVujkzav025k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "08c7ad4a0844adc4a7f9f5bb3beae482e789afa4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_9": { + "locked": { + "lastModified": 1609246779, + "narHash": "sha256-eq6ZXE/VWo3EMC65jmIT6H/rrUc9UWOWVujkzav025k=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "08c7ad4a0844adc4a7f9f5bb3beae482e789afa4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "grocy": { + "flake": false, + "locked": { + "lastModified": 1585166193, + "narHash": "sha256-rq1Fma/VgU01qXQmCghrt5k+LXWYt8z9b0NvGA7+/Y8=", + "owner": "grocy", + "repo": "grocy", + "rev": "d7738aa1ec330c81f11e4976681df0299d4ed35a", + "type": "github" + }, + "original": { + "owner": "grocy", + "repo": "grocy", + "rev": "d7738aa1ec330c81f11e4976681df0299d4ed35a", + "type": "github" + } + }, + "mastodon": { + "flake": false, + "locked": { + "lastModified": 1582790581, + "narHash": "sha256-YImWfvsJQzJHyKoWI6OP6BA+NvmHF2RiwJqOg0NUN/U=", + "owner": "tootsuite", + "repo": "mastodon", + "rev": "9bace2dd88d127d396794375c8fcb2132619a799", + "type": "github" + }, + "original": { + "owner": "tootsuite", + "ref": "v2.9.4", + "repo": "mastodon", + "type": "github" + } + }, + "mediagoblin": { + "flake": false, + "locked": { + "lastModified": 1531090939, + "narHash": "sha256-vSajRbuE/bu2HVsUZm25fkm/vNLXKDIK7Xn8kyKJ5Ps=", + "ref": "stable", + "rev": "cd465ebfec837a75a44c4ebd727dffe2fff6d850", + "revCount": 4805, + "submodules": true, + "type": "git", + "url": "https://git.savannah.gnu.org/git/mediagoblin.git" + }, + "original": { + "ref": "stable", + "rev": "cd465ebfec837a75a44c4ebd727dffe2fff6d850", + "submodules": true, + "type": "git", + "url": "https://git.savannah.gnu.org/git/mediagoblin.git" + } + }, + "my-lib": { + "inputs": { + "nixpkgs": "nixpkgs_18" + }, + "locked": { + "narHash": "sha256-mghjuNNCtvAjX8ly9MSmd+juG1a6PlaMhElRWqyxrS8=", + "path": "../../lib", + "type": "path" + }, + "original": { + "path": "../../lib", + "type": "path" + } + }, + "my-lib_2": { + "inputs": { + "nixpkgs": "nixpkgs_20" + }, + "locked": { + "narHash": "sha256-GAe7hK2n9U6hxiQt/IHq++fhFCxKJzgwQJK5/ZM4hSQ=", + "path": "../../lib", + "type": "path" + }, + "original": { + "path": "../../lib", + "type": "path" + } + }, + "my-lib_3": { + "inputs": { + "nixpkgs": "nixpkgs_22" + }, + "locked": { + "narHash": "sha256-HGNP1eH7b42BxViYx/F3ZPO9CM1X+5qfA9JoP2ArN+s=", + "path": "../../lib", + "type": "path" + }, + "original": { + "path": "../../lib", + "type": "path" + } + }, + "mypackages": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs" + }, + "locked": { + "narHash": "sha256-4vOb+ky1a7R/NjvrJpZYXORPfSk6yXzF9YjjUjKYY4g=", + "path": "./flakes/mypackages", + "type": "path" + }, + "original": { + "path": "./flakes/mypackages", + "type": "path" + } + }, + "mypackages_2": { + "inputs": { + "flake-parts": "flake-parts_3", + "nixpkgs": "nixpkgs_6" + }, + "locked": { + "narHash": "sha256-v0CkzgqCXRJkHZCIdDnrwFoHCXM5SwHFV+9msTQKf+I=", + "path": "../mypackages", + "type": "path" + }, + "original": { + "path": "../mypackages", + "type": "path" + } + }, + "mypackages_3": { + "inputs": { + "flake-parts": "flake-parts_4", + "nixpkgs": "nixpkgs_8" + }, + "locked": { + "narHash": "sha256-v0CkzgqCXRJkHZCIdDnrwFoHCXM5SwHFV+9msTQKf+I=", + "path": "../mypackages", + "type": "path" + }, + "original": { + "path": "../mypackages", + "type": "path" + } + }, + "mypackages_4": { + "inputs": { + "flake-parts": "flake-parts_5", + "nixpkgs": "nixpkgs_27" + }, + "locked": { + "narHash": "sha256-v0CkzgqCXRJkHZCIdDnrwFoHCXM5SwHFV+9msTQKf+I=", + "path": "../mypackages", + "type": "path" + }, + "original": { + "path": "../mypackages", + "type": "path" + } + }, + "myuids": { + "locked": { + "dir": "flakes/myuids", + "lastModified": 1636390024, + "narHash": "sha256-6T3re6sKcnla66im7UgG14UNa/Vvj6d/98JAOHbDpjQ=", + "ref": "master", + "rev": "fa25ffd4583cc362075cd5e1b4130f33306103f0", + "revCount": 901, + "type": "git", + "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" + }, + "original": { + "dir": "flakes/myuids", + "type": "git", + "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" + } + }, + "myuids_10": { + "locked": { + "dir": "flakes/myuids", + "lastModified": 1628207001, + "narHash": "sha256-7e12OfDv9zMOfqcAlsk1sZj2l3ZB03kcBdWUqhwVaWo=", + "ref": "master", + "rev": "dfe02d8fd52e33c7d4e1a209cf486696100b88f3", + "revCount": 865, + "type": "git", + "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" + }, + "original": { + "dir": "flakes/myuids", + "type": "git", + "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" + } + }, + "myuids_2": { + "locked": { + "dir": "flakes/myuids", + "lastModified": 1636390024, + "narHash": "sha256-6T3re6sKcnla66im7UgG14UNa/Vvj6d/98JAOHbDpjQ=", + "ref": "master", + "rev": "fa25ffd4583cc362075cd5e1b4130f33306103f0", + "revCount": 901, + "type": "git", + "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" + }, + "original": { + "dir": "flakes/myuids", + "type": "git", + "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" + } + }, + "myuids_3": { + "locked": { + "dir": "flakes/myuids", + "lastModified": 1636390024, + "narHash": "sha256-6T3re6sKcnla66im7UgG14UNa/Vvj6d/98JAOHbDpjQ=", + "ref": "master", + "rev": "fa25ffd4583cc362075cd5e1b4130f33306103f0", + "revCount": 901, + "type": "git", + "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" + }, + "original": { + "dir": "flakes/myuids", + "type": "git", + "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" + } + }, + "myuids_4": { + "locked": { + "dir": "flakes/myuids", + "lastModified": 1628207001, + "narHash": "sha256-7e12OfDv9zMOfqcAlsk1sZj2l3ZB03kcBdWUqhwVaWo=", + "ref": "master", + "rev": "dfe02d8fd52e33c7d4e1a209cf486696100b88f3", + "revCount": 865, + "type": "git", + "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" + }, + "original": { + "dir": "flakes/myuids", + "type": "git", + "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" + } + }, + "myuids_5": { + "locked": { + "dir": "flakes/myuids", + "lastModified": 1628207001, + "narHash": "sha256-7e12OfDv9zMOfqcAlsk1sZj2l3ZB03kcBdWUqhwVaWo=", + "ref": "master", + "rev": "dfe02d8fd52e33c7d4e1a209cf486696100b88f3", + "revCount": 865, + "type": "git", + "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" + }, + "original": { + "dir": "flakes/myuids", + "type": "git", + "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" + } + }, + "myuids_6": { + "locked": { + "dir": "flakes/myuids", + "lastModified": 1628207001, + "narHash": "sha256-7e12OfDv9zMOfqcAlsk1sZj2l3ZB03kcBdWUqhwVaWo=", + "ref": "master", + "rev": "dfe02d8fd52e33c7d4e1a209cf486696100b88f3", + "revCount": 865, + "type": "git", + "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" + }, + "original": { + "dir": "flakes/myuids", + "type": "git", + "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" + } + }, + "myuids_7": { + "locked": { + "dir": "flakes/myuids", + "lastModified": 1628207001, + "narHash": "sha256-7e12OfDv9zMOfqcAlsk1sZj2l3ZB03kcBdWUqhwVaWo=", + "ref": "master", + "rev": "dfe02d8fd52e33c7d4e1a209cf486696100b88f3", + "revCount": 865, + "type": "git", + "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" + }, + "original": { + "dir": "flakes/myuids", + "type": "git", + "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" + } + }, + "myuids_8": { + "locked": { + "dir": "flakes/myuids", + "lastModified": 1628207001, + "narHash": "sha256-7e12OfDv9zMOfqcAlsk1sZj2l3ZB03kcBdWUqhwVaWo=", + "ref": "master", + "rev": "dfe02d8fd52e33c7d4e1a209cf486696100b88f3", + "revCount": 865, + "type": "git", + "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" + }, + "original": { + "dir": "flakes/myuids", + "type": "git", + "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" + } + }, + "myuids_9": { + "locked": { + "dir": "flakes/myuids", + "lastModified": 1628207001, + "narHash": "sha256-7e12OfDv9zMOfqcAlsk1sZj2l3ZB03kcBdWUqhwVaWo=", + "ref": "master", + "rev": "dfe02d8fd52e33c7d4e1a209cf486696100b88f3", + "revCount": 865, + "type": "git", + "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" + }, + "original": { + "dir": "flakes/myuids", + "type": "git", + "url": "https://git.immae.eu/perso/Immae/Config/Nix.git" + } + }, + "nix-lib": { + "locked": { + "lastModified": 1675728117, + "narHash": "sha256-Q5JzYrpwEyx9/0He2ROEzUFu2JwLvtnNnS1fUB45WvQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1bda69b4294492363df8716263aa06ed6637148c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nix-lib_2": { + "locked": { + "lastModified": 1675728384, + "narHash": "sha256-OtuaHcx9+KQGo64MUpDXjLf9dkHA0VzvBTl8KLZVawY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "98a5726addacbf959005940172127ee5ae91c71f", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nix-lib_3": { + "locked": { + "lastModified": 1632955135, + "narHash": "sha256-MyOBftnLv5UcPCL4AzvlyNEDwGD2cGGM9HMEOno/MZw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a4d96cd808f13d924988938ecf9a46b2a2787fa3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1646497237, + "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026", + "type": "github" + } + }, + "nixpkgs-lib": { + "locked": { + "dir": "lib", + "lastModified": 1675183161, + "narHash": "sha256-Zq8sNgAxDckpn7tJo7V1afRSk2eoVbu3OjI1QklGLNg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e1e1b192c1a5aab2960bf0a0bd53a2e8124fa18e", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib_2": { + "locked": { + "dir": "lib", + "lastModified": 1675183161, + "narHash": "sha256-Zq8sNgAxDckpn7tJo7V1afRSk2eoVbu3OjI1QklGLNg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e1e1b192c1a5aab2960bf0a0bd53a2e8124fa18e", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib_3": { + "locked": { + "dir": "lib", + "lastModified": 1675183161, + "narHash": "sha256-Zq8sNgAxDckpn7tJo7V1afRSk2eoVbu3OjI1QklGLNg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e1e1b192c1a5aab2960bf0a0bd53a2e8124fa18e", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib_4": { + "locked": { + "dir": "lib", + "lastModified": 1675183161, + "narHash": "sha256-Zq8sNgAxDckpn7tJo7V1afRSk2eoVbu3OjI1QklGLNg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e1e1b192c1a5aab2960bf0a0bd53a2e8124fa18e", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib_5": { + "locked": { + "dir": "lib", + "lastModified": 1675183161, + "narHash": "sha256-Zq8sNgAxDckpn7tJo7V1afRSk2eoVbu3OjI1QklGLNg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e1e1b192c1a5aab2960bf0a0bd53a2e8124fa18e", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_10": { + "locked": { + "lastModified": 1648725829, + "narHash": "sha256-tXEzI38lLrzW2qCAIs0UAatE2xcsTsoKWaaXqAcF1NI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "72152ff5ad470ed1a5b97c0ba2737938c136c994", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { + "flake": false, + "locked": { + "lastModified": 1596265691, + "narHash": "sha256-9ofCzFqttTsGrvTaS4RrDSTNQO9PFOz5uyn8V+2eA5M=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "840c782d507d60aaa49aa9e3f6d0b0e780912742", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "840c782d507d60aaa49aa9e3f6d0b0e780912742", + "type": "github" + } + }, + "nixpkgs_12": { + "flake": false, + "locked": { + "lastModified": 1596265691, + "narHash": "sha256-9ofCzFqttTsGrvTaS4RrDSTNQO9PFOz5uyn8V+2eA5M=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "840c782d507d60aaa49aa9e3f6d0b0e780912742", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "840c782d507d60aaa49aa9e3f6d0b0e780912742", + "type": "github" + } + }, + "nixpkgs_13": { + "locked": { + "lastModified": 1597943282, + "narHash": "sha256-G/VQBlqO7YeFOSvn29RqdvABZxmQBtiRYVA6kjqWZ6o=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c59ea8b8a0e7f927e7291c14ea6cd1bd3a16ff38", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_14": { + "locked": { + "lastModified": 1597943282, + "narHash": "sha256-G/VQBlqO7YeFOSvn29RqdvABZxmQBtiRYVA6kjqWZ6o=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c59ea8b8a0e7f927e7291c14ea6cd1bd3a16ff38", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_15": { + "locked": { + "lastModified": 1631570365, + "narHash": "sha256-vc6bfo0hijpicdUDiui2DvZXmpIP2iqOFZRcpMOuYPo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "df7113c0727881519248d4c7d080324e0ee3327b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_16": { + "locked": { + "lastModified": 1611097871, + "narHash": "sha256-Q6bUkno5JNt0OoyXThFDrKArFBp/GryvJhwEgVzGSuk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "31f5dd3f3655fbedac19f64f77844aa5ed79501c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_17": { + "flake": false, + "locked": { + "lastModified": 1596265691, + "narHash": "sha256-9ofCzFqttTsGrvTaS4RrDSTNQO9PFOz5uyn8V+2eA5M=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "840c782d507d60aaa49aa9e3f6d0b0e780912742", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "840c782d507d60aaa49aa9e3f6d0b0e780912742", + "type": "github" + } + }, + "nixpkgs_18": { + "locked": { + "lastModified": 1648725829, + "narHash": "sha256-tXEzI38lLrzW2qCAIs0UAatE2xcsTsoKWaaXqAcF1NI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "72152ff5ad470ed1a5b97c0ba2737938c136c994", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_19": { + "locked": { + "lastModified": 1597943282, + "narHash": "sha256-G/VQBlqO7YeFOSvn29RqdvABZxmQBtiRYVA6kjqWZ6o=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c59ea8b8a0e7f927e7291c14ea6cd1bd3a16ff38", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1646497237, + "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026", + "type": "github" + } + }, + "nixpkgs_20": { + "locked": { + "lastModified": 1648725829, + "narHash": "sha256-tXEzI38lLrzW2qCAIs0UAatE2xcsTsoKWaaXqAcF1NI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "72152ff5ad470ed1a5b97c0ba2737938c136c994", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_21": { + "locked": { + "lastModified": 1597943282, + "narHash": "sha256-G/VQBlqO7YeFOSvn29RqdvABZxmQBtiRYVA6kjqWZ6o=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c59ea8b8a0e7f927e7291c14ea6cd1bd3a16ff38", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_22": { + "locked": { + "lastModified": 1631570365, + "narHash": "sha256-vc6bfo0hijpicdUDiui2DvZXmpIP2iqOFZRcpMOuYPo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "df7113c0727881519248d4c7d080324e0ee3327b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_23": { + "locked": { + "lastModified": 1631570365, + "narHash": "sha256-vc6bfo0hijpicdUDiui2DvZXmpIP2iqOFZRcpMOuYPo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "df7113c0727881519248d4c7d080324e0ee3327b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_24": { + "locked": { + "lastModified": 1611097871, + "narHash": "sha256-Q6bUkno5JNt0OoyXThFDrKArFBp/GryvJhwEgVzGSuk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "31f5dd3f3655fbedac19f64f77844aa5ed79501c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_25": { + "locked": { + "lastModified": 1611097871, + "narHash": "sha256-Q6bUkno5JNt0OoyXThFDrKArFBp/GryvJhwEgVzGSuk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "31f5dd3f3655fbedac19f64f77844aa5ed79501c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_26": { + "flake": false, + "locked": { + "lastModified": 1596265691, + "narHash": "sha256-9ofCzFqttTsGrvTaS4RrDSTNQO9PFOz5uyn8V+2eA5M=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "840c782d507d60aaa49aa9e3f6d0b0e780912742", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "840c782d507d60aaa49aa9e3f6d0b0e780912742", + "type": "github" + } + }, + "nixpkgs_27": { + "locked": { + "lastModified": 1646497237, + "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026", + "type": "github" + } + }, + "nixpkgs_28": { + "flake": false, + "locked": { + "lastModified": 1596265691, + "narHash": "sha256-9ofCzFqttTsGrvTaS4RrDSTNQO9PFOz5uyn8V+2eA5M=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "840c782d507d60aaa49aa9e3f6d0b0e780912742", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "840c782d507d60aaa49aa9e3f6d0b0e780912742", + "type": "github" + } + }, + "nixpkgs_29": { + "flake": false, + "locked": { + "lastModified": 1596265691, + "narHash": "sha256-9ofCzFqttTsGrvTaS4RrDSTNQO9PFOz5uyn8V+2eA5M=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "840c782d507d60aaa49aa9e3f6d0b0e780912742", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "840c782d507d60aaa49aa9e3f6d0b0e780912742", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1672080458, + "narHash": "sha256-Ukjn8YUwZevxDPaVUmTx2sf9bCcIJSasmLz+xjGBKrs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1eb875e811dd59e21e77f6337f2c1592889b48b3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1633901457, + "narHash": "sha256-GNJLwKENqEA4xlzkWI76VLHBAua4LUIlTeeiH4FR7Gc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f358794824b4595d77fec93732485d329ed7b0e0", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "flake": false, + "locked": { + "lastModified": 1596265691, + "narHash": "sha256-9ofCzFqttTsGrvTaS4RrDSTNQO9PFOz5uyn8V+2eA5M=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "840c782d507d60aaa49aa9e3f6d0b0e780912742", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "840c782d507d60aaa49aa9e3f6d0b0e780912742", + "type": "github" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1646497237, + "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026", + "type": "github" + } + }, + "nixpkgs_7": { + "flake": false, + "locked": { + "lastModified": 1596265691, + "narHash": "sha256-9ofCzFqttTsGrvTaS4RrDSTNQO9PFOz5uyn8V+2eA5M=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "840c782d507d60aaa49aa9e3f6d0b0e780912742", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "840c782d507d60aaa49aa9e3f6d0b0e780912742", + "type": "github" + } + }, + "nixpkgs_8": { + "locked": { + "lastModified": 1646497237, + "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026", + "type": "github" + } + }, + "nixpkgs_9": { + "flake": false, + "locked": { + "lastModified": 1596265691, + "narHash": "sha256-9ofCzFqttTsGrvTaS4RrDSTNQO9PFOz5uyn8V+2eA5M=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "840c782d507d60aaa49aa9e3f6d0b0e780912742", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "840c782d507d60aaa49aa9e3f6d0b0e780912742", + "type": "github" + } + }, + "openarc": { + "flake": false, + "locked": { + "lastModified": 1537545083, + "narHash": "sha256-xUSRARC7875vFjtZ66t8KBlKmkEdIZblWHc4zqGZAQQ=", + "owner": "trusteddomainproject", + "repo": "OpenARC", + "rev": "355ee2a1ca85acccce494478991983b54f794f4e", + "type": "github" + }, + "original": { + "owner": "trusteddomainproject", + "repo": "OpenARC", + "type": "github" + } + }, + "openarc_2": { + "inputs": { + "flake-utils": "flake-utils_13", + "myuids": "myuids_7", + "nixpkgs": "nixpkgs_19", + "openarc": "openarc_3" + }, + "locked": { + "narHash": "sha256-ilrfNs6jpi1OceDE3y1atkovECx6PKNWubwLc0Sjx+s=", + "path": "../../openarc", + "type": "path" + }, + "original": { + "path": "../../openarc", + "type": "path" + } + }, + "openarc_3": { + "flake": false, + "locked": { + "lastModified": 1537545083, + "narHash": "sha256-xUSRARC7875vFjtZ66t8KBlKmkEdIZblWHc4zqGZAQQ=", + "owner": "trusteddomainproject", + "repo": "OpenARC", + "rev": "355ee2a1ca85acccce494478991983b54f794f4e", + "type": "github" + }, + "original": { + "owner": "trusteddomainproject", + "repo": "OpenARC", + "type": "github" + } + }, + "opendmarc": { + "inputs": { + "flake-utils": "flake-utils_14", + "myuids": "myuids_8", + "nixpkgs": "nixpkgs_21" + }, + "locked": { + "narHash": "sha256-7jup/d3+WXXWsNMB7Sp5Py4rJQV30Z5+PJITBISbQ9o=", + "path": "../../opendmarc", + "type": "path" + }, + "original": { + "path": "../../opendmarc", + "type": "path" + } + }, + "paste": { + "inputs": { + "flake-utils": "flake-utils_15", + "nixpkgs": "nixpkgs_23" + }, + "locked": { + "narHash": "sha256-971ljwzJ+hJj8M+sMnsDWjf7UR261tUMZebh2T6VssM=", + "path": "../../paste", + "type": "path" + }, + "original": { + "path": "../../paste", + "type": "path" + } + }, + "peertube": { + "flake": false, + "locked": { + "lastModified": 1610436329, + "narHash": "sha256-bIXt5bQiBBlNDFXYzcdQA8qp4nse5epUx/XQOguDOX8=", + "owner": "Chocobozzz", + "repo": "PeerTube", + "rev": "69e0e678beb7f1a3b6753eeff585a14f9a61ea86", + "type": "github" + }, + "original": { + "owner": "Chocobozzz", + "ref": "v3.0.1", + "repo": "PeerTube", + "type": "github" + } + }, + "peertube_2": { + "flake": false, + "locked": { + "lastModified": 1610436329, + "narHash": "sha256-bIXt5bQiBBlNDFXYzcdQA8qp4nse5epUx/XQOguDOX8=", + "owner": "Chocobozzz", + "repo": "PeerTube", + "rev": "69e0e678beb7f1a3b6753eeff585a14f9a61ea86", + "type": "github" + }, + "original": { + "owner": "Chocobozzz", + "ref": "v3.0.1", + "repo": "PeerTube", + "type": "github" + } + }, + "peertube_3": { + "flake": false, + "locked": { + "lastModified": 1611184594, + "narHash": "sha256-1N59Dmo9zny+bZWRPiR7fXConECAw9OFcVIWMp2wois=", + "ref": "gitolite_local/syden", + "rev": "f49b8d9b697f098490e81ce0afd889ba37dcb2f3", + "revCount": 6316, + "type": "git", + "url": "https://git.immae.eu/github/Chocobozzz/PeerTube.git" + }, + "original": { + "ref": "gitolite_local/syden", + "type": "git", + "url": "https://git.immae.eu/github/Chocobozzz/PeerTube.git" + } + }, + "peertube_origin": { + "inputs": { + "flake-utils": "flake-utils_16", + "myuids": "myuids_9", + "nixpkgs": "nixpkgs_24", + "peertube": "peertube_2" + }, + "locked": { + "narHash": "sha256-01nut8vbrR8s8G2JnRaxooZdefH1LMbhuJpgcH1e3vY=", + "path": "./../../peertube", + "type": "path" + }, + "original": { + "path": "./../../peertube", + "type": "path" + } + }, + "peertube_syden": { + "inputs": { + "flake-utils": "flake-utils_17", + "myuids": "myuids_10", + "nixpkgs": "nixpkgs_25", + "peertube": "peertube_3" + }, + "locked": { + "narHash": "sha256-01nut8vbrR8s8G2JnRaxooZdefH1LMbhuJpgcH1e3vY=", + "path": "./../../peertube", + "type": "path" + }, + "original": { + "path": "./../../peertube", + "type": "path" + } + }, + "root": { + "inputs": { + "flake-parts": "flake-parts", + "mypackages": "mypackages", + "nixpkgs": "nixpkgs_2", + "s-backports": "s-backports", + "s-copanier": "s-copanier", + "s-diaspora": "s-diaspora", + "s-etherpad-lite": "s-etherpad-lite", + "s-fiche": "s-fiche", + "s-files-watcher": "s-files-watcher", + "s-grocy": "s-grocy", + "s-lib": "s-lib", + "s-mastodon": "s-mastodon", + "s-mediagoblin": "s-mediagoblin", + "s-myuids": "s-myuids", + "s-openarc": "s-openarc", + "s-opendmarc": "s-opendmarc", + "s-paste": "s-paste", + "s-peertube": "s-peertube", + "s-private-buildbot": "s-private-buildbot", + "s-private-openarc": "s-private-openarc", + "s-private-opendmarc": "s-private-opendmarc", + "s-private-paste": "s-private-paste", + "s-private-peertube": "s-private-peertube", + "s-private-php": "s-private-php", + "s-rsync_backup": "s-rsync_backup", + "s-secrets": "s-secrets", + "s-surfer": "s-surfer", + "s-taskwarrior-web": "s-taskwarrior-web" + } + }, + "s-backports": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "narHash": "sha256-xpFLnQUYDWXq3MVAuNJ95c7qHUcn8wzwxdUJq04IL8E=", + "path": "./flakes/backports", + "type": "path" + }, + "original": { + "path": "./flakes/backports", + "type": "path" + } + }, + "s-copanier": { + "inputs": { + "copanier": "copanier", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "narHash": "sha256-fO3Nvv+M/fFg0ANINkRcs1uprz6LE+02XU2nYTh1O2E=", + "path": "./flakes/copanier", + "type": "path" + }, + "original": { + "path": "./flakes/copanier", + "type": "path" + } + }, + "s-diaspora": { + "inputs": { + "diaspora": "diaspora", + "flake-utils": "flake-utils_3", + "myuids": "myuids", + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "narHash": "sha256-YK8Zqy59xO3AKjZXwyfJo5Z9s0AIOmQOTXSGOccEt/E=", + "path": "./flakes/diaspora", + "type": "path" + }, + "original": { + "path": "./flakes/diaspora", + "type": "path" + } + }, + "s-etherpad-lite": { + "inputs": { + "etherpad-lite": "etherpad-lite", + "flake-utils": "flake-utils_4", + "mypackages": "mypackages_2", + "nixpkgs": "nixpkgs_7" + }, + "locked": { + "narHash": "sha256-GCFhAe6PjQloonzqYiiciQ1VT4UHa7Gdkc3Qf6KgfB0=", + "path": "./flakes/etherpad-lite", + "type": "path" + }, + "original": { + "path": "./flakes/etherpad-lite", + "type": "path" + } + }, + "s-fiche": { + "locked": { + "narHash": "sha256-oIMKN1dD4K+5pOGugNaNNdJme5NYlYtnNd3ivvyVoJI=", + "path": "./flakes/fiche", + "type": "path" + }, + "original": { + "path": "./flakes/fiche", + "type": "path" + } + }, + "s-files-watcher": { + "locked": { + "narHash": "sha256-6urOJuzXsu4HJHyVmrZHd40SMzzTeHiOiDOM40q53Y0=", + "path": "./flakes/files-watcher", + "type": "path" + }, + "original": { + "path": "./flakes/files-watcher", + "type": "path" + } + }, + "s-grocy": { + "inputs": { + "flake-utils": "flake-utils_5", + "grocy": "grocy", + "mypackages": "mypackages_3", + "nixpkgs": "nixpkgs_9" + }, + "locked": { + "narHash": "sha256-szAjUp20ujWlR0oNsHXDVdCLKFqUoe6GP/UyVZlghxc=", + "path": "./flakes/grocy", + "type": "path" + }, + "original": { + "path": "./flakes/grocy", + "type": "path" + } + }, + "s-lib": { + "inputs": { + "nixpkgs": "nixpkgs_10" + }, + "locked": { + "narHash": "sha256-GAe7hK2n9U6hxiQt/IHq++fhFCxKJzgwQJK5/ZM4hSQ=", + "path": "./flakes/lib", + "type": "path" + }, + "original": { + "path": "./flakes/lib", + "type": "path" + } + }, + "s-mastodon": { + "inputs": { + "flake-utils": "flake-utils_6", + "mastodon": "mastodon", + "myuids": "myuids_2", + "nixpkgs": "nixpkgs_11" + }, + "locked": { + "narHash": "sha256-qGSMn+I5f/ajYCcCnBydvyAt0zQZY6SunOgTCMgmHjI=", + "path": "./flakes/mastodon", + "type": "path" + }, + "original": { + "path": "./flakes/mastodon", + "type": "path" + } + }, + "s-mediagoblin": { + "inputs": { + "flake-utils": "flake-utils_7", + "mediagoblin": "mediagoblin", + "myuids": "myuids_3", + "nixpkgs": "nixpkgs_12" + }, + "locked": { + "narHash": "sha256-7SSDJIFiM2+cbR2xxoMcOnnw8lEUW5IayZPtN2gwYhs=", + "path": "./flakes/mediagoblin", + "type": "path" + }, + "original": { + "path": "./flakes/mediagoblin", + "type": "path" + } + }, + "s-myuids": { + "locked": { + "narHash": "sha256-TTXicKdFFy8TeOvdPraXWQcaHKPRJ9s6aAFLtjE+/60=", + "path": "./flakes/myuids", + "type": "path" + }, + "original": { + "path": "./flakes/myuids", + "type": "path" + } + }, + "s-openarc": { + "inputs": { + "flake-utils": "flake-utils_8", + "myuids": "myuids_4", + "nixpkgs": "nixpkgs_13", + "openarc": "openarc" + }, + "locked": { + "narHash": "sha256-ilrfNs6jpi1OceDE3y1atkovECx6PKNWubwLc0Sjx+s=", + "path": "./flakes/openarc", + "type": "path" + }, + "original": { + "path": "./flakes/openarc", + "type": "path" + } + }, + "s-opendmarc": { + "inputs": { + "flake-utils": "flake-utils_9", + "myuids": "myuids_5", + "nixpkgs": "nixpkgs_14" + }, + "locked": { + "narHash": "sha256-7jup/d3+WXXWsNMB7Sp5Py4rJQV30Z5+PJITBISbQ9o=", + "path": "./flakes/opendmarc", + "type": "path" + }, + "original": { + "path": "./flakes/opendmarc", + "type": "path" + } + }, + "s-paste": { + "inputs": { + "flake-utils": "flake-utils_10", + "nixpkgs": "nixpkgs_15" + }, + "locked": { + "narHash": "sha256-971ljwzJ+hJj8M+sMnsDWjf7UR261tUMZebh2T6VssM=", + "path": "./flakes/paste", + "type": "path" + }, + "original": { + "path": "./flakes/paste", + "type": "path" + } + }, + "s-peertube": { + "inputs": { + "flake-utils": "flake-utils_11", + "myuids": "myuids_6", + "nixpkgs": "nixpkgs_16", + "peertube": "peertube" + }, + "locked": { + "narHash": "sha256-01nut8vbrR8s8G2JnRaxooZdefH1LMbhuJpgcH1e3vY=", + "path": "./flakes/peertube", + "type": "path" + }, + "original": { + "path": "./flakes/peertube", + "type": "path" + } + }, + "s-private-buildbot": { + "inputs": { + "buildslist": "buildslist", + "flake-utils": "flake-utils_12", + "nixpkgs": "nixpkgs_17" + }, + "locked": { + "narHash": "sha256-gLrqLnjJKP3JNH8ipLURUvlkA9UqtlymrVJrfoM8Uic=", + "path": "./flakes/private/buildbot", + "type": "path" + }, + "original": { + "path": "./flakes/private/buildbot", + "type": "path" + } + }, + "s-private-openarc": { + "inputs": { + "files-watcher": "files-watcher", + "my-lib": "my-lib", + "nix-lib": "nix-lib", + "openarc": "openarc_2", + "secrets": "secrets" + }, + "locked": { + "narHash": "sha256-uqvuziPeHPUwhXMGuVNZnOTVX/arwwcd57I+4/o8x10=", + "path": "./flakes/private/openarc", + "type": "path" + }, + "original": { + "path": "./flakes/private/openarc", + "type": "path" + } + }, + "s-private-opendmarc": { + "inputs": { + "files-watcher": "files-watcher_2", + "my-lib": "my-lib_2", + "nix-lib": "nix-lib_2", + "opendmarc": "opendmarc", + "secrets": "secrets_2" + }, + "locked": { + "narHash": "sha256-bqXFAj07LPWuOyx20x6wdHgHDJG44evfVugeje428UI=", + "path": "./flakes/private/opendmarc", + "type": "path" + }, + "original": { + "path": "./flakes/private/opendmarc", + "type": "path" + } + }, + "s-private-paste": { + "inputs": { + "my-lib": "my-lib_3", + "nix-lib": "nix-lib_3", + "paste": "paste" + }, + "locked": { + "narHash": "sha256-Wlq5iItfcONT/IhUMirIkAs+0Dq5xBZDTg60SKUAe4A=", + "path": "./flakes/private/paste", + "type": "path" + }, + "original": { + "path": "./flakes/private/paste", + "type": "path" + } + }, + "s-private-peertube": { + "inputs": { + "peertube_origin": "peertube_origin", + "peertube_syden": "peertube_syden" + }, + "locked": { + "narHash": "sha256-rNJdvm4w5uhZlFL7uxrC+q7Lm0HYbPwGjWXlhID4/Tw=", + "path": "./flakes/private/peertube", + "type": "path" + }, + "original": { + "path": "./flakes/private/peertube", + "type": "path" + } + }, + "s-private-php": { + "inputs": { + "flake-utils": "flake-utils_18", + "nixpkgs": "nixpkgs_26" + }, + "locked": { + "narHash": "sha256-WDm/mjcEDt8ZF67A9t+40V//1SHWUdEJCoKscbfrtV4=", + "path": "./flakes/private/php", + "type": "path" + }, + "original": { + "path": "./flakes/private/php", + "type": "path" + } + }, + "s-rsync_backup": { + "locked": { + "narHash": "sha256-TxLsFx4DTTScMHkvR0pJgzYea6ILiu1Dl6LA67LtYGo=", + "path": "./flakes/rsync_backup", + "type": "path" + }, + "original": { + "path": "./flakes/rsync_backup", + "type": "path" + } + }, + "s-secrets": { + "locked": { + "narHash": "sha256-C1BA1I+pw/xVkeKo8nJu5x2ijJENzLebWXVR1hfcK7Y=", + "path": "./flakes/secrets", + "type": "path" + }, + "original": { + "path": "./flakes/secrets", + "type": "path" + } + }, + "s-surfer": { + "inputs": { + "flake-utils": "flake-utils_19", + "mypackages": "mypackages_4", + "nixpkgs": "nixpkgs_28", + "surfer": "surfer" + }, + "locked": { + "narHash": "sha256-fIQ5nbi17kkzAcRwCe12Fz7IRfAPz9mAhUarOP1dcD8=", + "path": "./flakes/surfer", + "type": "path" + }, + "original": { + "path": "./flakes/surfer", + "type": "path" + } + }, + "s-taskwarrior-web": { + "inputs": { + "flake-utils": "flake-utils_20", + "nixpkgs": "nixpkgs_29", + "taskwarrior-web": "taskwarrior-web" + }, + "locked": { + "narHash": "sha256-0u83WrBwbIpuyy82UK3EUqC/dgoCoDzptRe+G4VhKXo=", + "path": "./flakes/taskwarrior-web", + "type": "path" + }, + "original": { + "path": "./flakes/taskwarrior-web", + "type": "path" + } + }, + "secrets": { + "locked": { + "narHash": "sha256-C1BA1I+pw/xVkeKo8nJu5x2ijJENzLebWXVR1hfcK7Y=", + "path": "../../secrets", + "type": "path" + }, + "original": { + "path": "../../secrets", + "type": "path" + } + }, + "secrets_2": { + "locked": { + "narHash": "sha256-C1BA1I+pw/xVkeKo8nJu5x2ijJENzLebWXVR1hfcK7Y=", + "path": "../../secrets", + "type": "path" + }, + "original": { + "path": "../../secrets", + "type": "path" + } + }, + "surfer": { + "flake": false, + "locked": { + "lastModified": 1588637864, + "narHash": "sha256-B1Sbu1YSHj+ONSoT5v6bVlAHJWtceUV4O5huGhc8b0U=", + "rev": "476177380452c9c7c5b1624805feedc824c5995e", + "revCount": 318, + "type": "git", + "url": "https://git.immae.eu/perso/Immae/Projets/Nodejs/Surfer.git" + }, + "original": { + "rev": "476177380452c9c7c5b1624805feedc824c5995e", + "type": "git", + "url": "https://git.immae.eu/perso/Immae/Projets/Nodejs/Surfer.git" + } + }, + "taskwarrior-web": { + "flake": false, + "locked": { + "lastModified": 1546434241, + "narHash": "sha256-BLPBglkV1HCJECSIdyMEergChiV+rwNOClYJnzlZGQk=", + "owner": "theunraveler", + "repo": "taskwarrior-web", + "rev": "a79cfe2b42791b62364118e58b21b892fff6ded8", + "type": "github" + }, + "original": { + "owner": "theunraveler", + "repo": "taskwarrior-web", + "rev": "a79cfe2b42791b62364118e58b21b892fff6ded8", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..cb3548f --- /dev/null +++ b/flake.nix @@ -0,0 +1,61 @@ +{ + description = "immae-eu infrastructure"; + inputs = { + flake-parts.url = "github:hercules-ci/flake-parts"; + # TODO: use nixos-unstable branch at some point and use the lock to keep the actual commit + nixpkgs.url = "github:nixos/nixpkgs/062a0c5437b68f950b081bbfc8a699d57a4ee026"; + + s-backports.url = "path:./flakes/backports"; + s-copanier.url = "path:./flakes/copanier"; + s-diaspora.url = "path:./flakes/diaspora"; + s-etherpad-lite.url = "path:./flakes/etherpad-lite"; + s-fiche.url = "path:./flakes/fiche"; + s-files-watcher.url = "path:./flakes/files-watcher"; + s-grocy.url = "path:./flakes/grocy"; + s-lib.url = "path:./flakes/lib"; + s-mastodon.url = "path:./flakes/mastodon"; + s-mediagoblin.url = "path:./flakes/mediagoblin"; + s-myuids.url = "path:./flakes/myuids"; + s-openarc.url = "path:./flakes/openarc"; + s-opendmarc.url = "path:./flakes/opendmarc"; + s-paste.url = "path:./flakes/paste"; + s-peertube.url = "path:./flakes/peertube"; + s-rsync_backup.url = "path:./flakes/rsync_backup"; + s-secrets.url = "path:./flakes/secrets"; + s-surfer.url = "path:./flakes/surfer"; + s-taskwarrior-web.url = "path:./flakes/taskwarrior-web"; + + s-private-buildbot.url = "path:./flakes/private/buildbot"; + s-private-openarc.url = "path:./flakes/private/openarc"; + s-private-opendmarc.url = "path:./flakes/private/opendmarc"; + s-private-paste.url = "path:./flakes/private/paste"; + s-private-peertube.url = "path:./flakes/private/peertube"; + s-private-php.url = "path:./flakes/private/php"; + + mypackages.url = "path:./flakes/mypackages"; + }; + outputs = inputs@{ self, flake-parts, mypackages, ... }: + flake-parts.lib.mkFlake { inherit inputs; } { + imports = [ + (mypackages.mylibs.flakePartsAddPerSystem { name = "lib"; type = "unspecified"; }) + (mypackages.mylibs.flakePartsAddPerSystem { name = "environments"; type = "package"; }) + ]; + systems = [ "x86_64-linux" ]; + perSystem = { config, inputs', pkgs, ... }: + { + inherit (inputs'.mypackages) packages environments lib; + }; + flake = { + inherit (mypackages) mylibs sources overlays; + subflakes = let + flakeNames = builtins.map (a: builtins.substring 2 (builtins.stringLength a) a) (builtins.filter (a: builtins.substring 0 2 a == "s-") (builtins.attrNames inputs)); + partitionned = builtins.partition (a: builtins.substring 0 8 a == "private-") flakeNames; + privateFlakes = builtins.map (a: builtins.substring 8 (builtins.stringLength a) a) partitionned.right; + publicFlakes = partitionned.wrong; + in { + public = builtins.foldl' (a: b: a // { "${b}" = inputs."s-${b}"; }) {} publicFlakes; + private = builtins.foldl' (a: b: a // { "${b}" = inputs."s-private-${b}"; }) {} privateFlakes; + }; + }; + }; +} diff --git a/flakes/etherpad-lite/default.nix b/flakes/etherpad-lite/default.nix index 5274351..1dd5aa4 100644 --- a/flakes/etherpad-lite/default.nix +++ b/flakes/etherpad-lite/default.nix @@ -1,7 +1,6 @@ { varDir ? "/var/lib/etherpad-lite" # if you override this change the StateDirectory in service file too! -, stdenv, callPackage, src, lib, nodejs }: +, nodeEnv, stdenv, callPackage, src, lib, nodejs }: let - nodeEnv = callPackage ../../lib/node-env.nix {}; moduleNames = [ "ep_aa_file_menu_toolbar" "ep_adminpads" "ep_align" "ep_bookmark" "ep_clear_formatting" "ep_colors" "ep_comments_page" @@ -14,7 +13,7 @@ let ]; # nix files are built using node2nix -i node-packages.json allModules = lib.attrsets.genAttrs moduleNames - (name: (callPackage (./modules + "/${name}/node-packages.nix") { inherit nodeEnv; }).${name}); + (name: (callPackage (./modules + "/${name}/node-packages.nix") { nodeEnv = callPackage nodeEnv {}; }).${name}); toPassthru = pkg: moduleNames: { inherit varDir allModules nodejs moduleNames; withModules = withModules pkg; @@ -38,7 +37,7 @@ let # built using node2nix -l package-lock.json # and changing "./." to "src" node-environment = (callPackage ./node-packages.nix { - inherit nodeEnv; + nodeEnv = callPackage nodeEnv {}; src = stdenv.mkDerivation { pname = "etherpad-lite"; version = src.version; diff --git a/flakes/etherpad-lite/etherpad-lite.json b/flakes/etherpad-lite/etherpad-lite.json deleted file mode 100644 index 0d68df1..0000000 --- a/flakes/etherpad-lite/etherpad-lite.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "tag": "1.8.3", - "meta": { - "name": "etherpad-lite", - "url": "https://github.com/ether/etherpad-lite", - "branch": "refs/tags/1.8.3" - }, - "github": { - "owner": "ether", - "repo": "etherpad-lite", - "rev": "62101147a0c3495dc80daa87ab53a3366321a205", - "sha256": "1d726qldw3bil4x7j39aqk7m71kyjvxklai5238rrd5v82z28c1y", - "fetchSubmodules": true - } -} diff --git a/flakes/etherpad-lite/flake.lock b/flakes/etherpad-lite/flake.lock index 9790caf..460912c 100644 --- a/flakes/etherpad-lite/flake.lock +++ b/flakes/etherpad-lite/flake.lock @@ -17,6 +17,24 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1675295133, + "narHash": "sha256-dU8fuLL98WFXG0VnRgM00bqKX6CEPBLybhiIDIgO45o=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "bf53492df08f3178ce85e0c9df8ed8d03c030c9f", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1648297722, @@ -32,7 +50,56 @@ "type": "github" } }, + "mypackages": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs" + }, + "locked": { + "narHash": "sha256-v0CkzgqCXRJkHZCIdDnrwFoHCXM5SwHFV+9msTQKf+I=", + "path": "../mypackages", + "type": "path" + }, + "original": { + "path": "../mypackages", + "type": "path" + } + }, "nixpkgs": { + "locked": { + "lastModified": 1646497237, + "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026", + "type": "github" + } + }, + "nixpkgs-lib": { + "locked": { + "dir": "lib", + "lastModified": 1675183161, + "narHash": "sha256-Zq8sNgAxDckpn7tJo7V1afRSk2eoVbu3OjI1QklGLNg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e1e1b192c1a5aab2960bf0a0bd53a2e8124fa18e", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { "flake": false, "locked": { "lastModified": 1596265691, @@ -53,7 +120,8 @@ "inputs": { "etherpad-lite": "etherpad-lite", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "mypackages": "mypackages", + "nixpkgs": "nixpkgs_2" } } }, diff --git a/flakes/etherpad-lite/flake.nix b/flakes/etherpad-lite/flake.nix index eb88f1f..6e0d7db 100644 --- a/flakes/etherpad-lite/flake.nix +++ b/flakes/etherpad-lite/flake.nix @@ -9,14 +9,15 @@ url = "github:ether/etherpad-lite/1.8.3"; flake = false; }; + inputs.mypackages.url = "path:../mypackages"; - outputs = { self, nixpkgs, etherpad-lite, flake-utils }: flake-utils.lib.eachSystem ["x86_64-linux"] (system: + outputs = { self, nixpkgs, etherpad-lite, flake-utils, mypackages }: flake-utils.lib.eachSystem ["x86_64-linux"] (system: let pkgs = import nixpkgs { inherit system; overlays = []; }; version = (builtins.fromJSON (builtins.readFile ./flake.lock)).nodes.etherpad-lite.original.ref; inherit (pkgs) callPackage; in rec { - packages.etherpad-lite = callPackage ./. { src = etherpad-lite // { inherit version; }; }; + packages.etherpad-lite = callPackage ./. { inherit (mypackages.mylibs) nodeEnv; src = etherpad-lite // { inherit version; }; }; defaultPackage = packages.etherpad-lite; legacyPackages.etherpad-lite = packages.etherpad-lite; checks = { diff --git a/flakes/grocy/flake.lock b/flakes/grocy/flake.lock index 3ae40a7..6be3f1b 100644 --- a/flakes/grocy/flake.lock +++ b/flakes/grocy/flake.lock @@ -1,5 +1,23 @@ { "nodes": { + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1675295133, + "narHash": "sha256-dU8fuLL98WFXG0VnRgM00bqKX6CEPBLybhiIDIgO45o=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "bf53492df08f3178ce85e0c9df8ed8d03c030c9f", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1648297722, @@ -32,7 +50,56 @@ "type": "github" } }, + "mypackages": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs" + }, + "locked": { + "narHash": "sha256-v0CkzgqCXRJkHZCIdDnrwFoHCXM5SwHFV+9msTQKf+I=", + "path": "../mypackages", + "type": "path" + }, + "original": { + "path": "../mypackages", + "type": "path" + } + }, "nixpkgs": { + "locked": { + "lastModified": 1646497237, + "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026", + "type": "github" + } + }, + "nixpkgs-lib": { + "locked": { + "dir": "lib", + "lastModified": 1675183161, + "narHash": "sha256-Zq8sNgAxDckpn7tJo7V1afRSk2eoVbu3OjI1QklGLNg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e1e1b192c1a5aab2960bf0a0bd53a2e8124fa18e", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { "flake": false, "locked": { "lastModified": 1596265691, @@ -53,7 +120,8 @@ "inputs": { "flake-utils": "flake-utils", "grocy": "grocy", - "nixpkgs": "nixpkgs" + "mypackages": "mypackages", + "nixpkgs": "nixpkgs_2" } } }, diff --git a/flakes/grocy/flake.nix b/flakes/grocy/flake.nix index da2f04f..a08852f 100644 --- a/flakes/grocy/flake.nix +++ b/flakes/grocy/flake.nix @@ -9,10 +9,11 @@ url = "github:grocy/grocy/d7738aa1ec330c81f11e4976681df0299d4ed35a"; flake = false; }; - outputs = { self, nixpkgs, grocy, flake-utils }: flake-utils.lib.eachSystem ["x86_64-linux"] (system: + inputs.mypackages.url = "path:../mypackages"; + outputs = { self, nixpkgs, grocy, flake-utils, mypackages }: flake-utils.lib.eachSystem ["x86_64-linux"] (system: let pkgs = import nixpkgs { inherit system; overlays = []; }; - composerEnv = pkgs.callPackage ../../pkgs/composer-env {}; + composerEnv = mypackages.lib."${system}".composerEnv; version = (builtins.fromJSON (builtins.readFile ./flake.lock)).nodes.grocy.original.ref; inherit (pkgs) callPackage; in rec { diff --git a/flakes/lib/flake.nix b/flakes/lib/flake.nix index a352c4c..ab1a6aa 100644 --- a/flakes/lib/flake.nix +++ b/flakes/lib/flake.nix @@ -4,13 +4,6 @@ description = "Useful libs"; outputs = { self, nixpkgs }: { lib = rec { - withNarKeyCompat = flakeCompat: path: moduleAttrs: - let module = (flakeCompat path).${moduleAttrs}; - key = builtins.hashString "sha256" (builtins.path { inherit path; name = "source"; }); - in if builtins.isFunction module - then args@{ config, lib, pkgs, ... }: (module args // { inherit key; }) - else module // { inherit key; }; - withNarKey = dep: moduleAttrs: let module = dep.${moduleAttrs}; key = builtins.hashString "sha256" (builtins.path { path = dep.sourceInfo.outPath; name = "source"; }); diff --git a/environments/default.nix b/flakes/mypackages/environments/default.nix similarity index 100% rename from environments/default.nix rename to flakes/mypackages/environments/default.nix diff --git a/environments/immae-eu.nix b/flakes/mypackages/environments/immae-eu.nix similarity index 100% rename from environments/immae-eu.nix rename to flakes/mypackages/environments/immae-eu.nix diff --git a/flakes/mypackages/flake.lock b/flakes/mypackages/flake.lock new file mode 100644 index 0000000..9515aa7 --- /dev/null +++ b/flakes/mypackages/flake.lock @@ -0,0 +1,64 @@ +{ + "nodes": { + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1675295133, + "narHash": "sha256-dU8fuLL98WFXG0VnRgM00bqKX6CEPBLybhiIDIgO45o=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "bf53492df08f3178ce85e0c9df8ed8d03c030c9f", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1646497237, + "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026", + "type": "github" + } + }, + "nixpkgs-lib": { + "locked": { + "dir": "lib", + "lastModified": 1675183161, + "narHash": "sha256-Zq8sNgAxDckpn7tJo7V1afRSk2eoVbu3OjI1QklGLNg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e1e1b192c1a5aab2960bf0a0bd53a2e8124fa18e", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flakes/mypackages/flake.nix b/flakes/mypackages/flake.nix new file mode 100644 index 0000000..5860ff1 --- /dev/null +++ b/flakes/mypackages/flake.nix @@ -0,0 +1,37 @@ +{ + description = "immae-eu infrastructure"; + inputs = { + flake-parts.url = "github:hercules-ci/flake-parts"; + # TODO: use nixos-unstable branch at some point and use the lock to keep the actual commit + nixpkgs.url = "github:nixos/nixpkgs/062a0c5437b68f950b081bbfc8a699d57a4ee026"; + }; + outputs = inputs@{ self, flake-parts, ... }: + flake-parts.lib.mkFlake { inherit inputs; } { + imports = [ + (import ./lib/flake-parts-lib.nix { name = "lib"; type = "unspecified"; }) + (import ./lib/flake-parts-lib.nix { name = "environments"; type = "package"; }) + ]; + systems = [ "x86_64-linux" ]; + perSystem = { config, inputs', pkgs, ... }: + let + mypkgs = import ./pkgs/default.nix { forFlakes = true; inherit pkgs; inherit (self) mylibs sources environments; }; + in { + packages = + builtins.removeAttrs mypkgs [ "myEnvironments" "composerEnv" "webapps" "status_engine" "python3PackagesPlus" ] // + (pkgs.lib.mapAttrs' (n: pkgs.lib.nameValuePair ("status-engine-" + n)) mypkgs.status_engine) // + (pkgs.lib.mapAttrs' (n: pkgs.lib.nameValuePair ("webapps-" + n)) (builtins.removeAttrs mypkgs.webapps [ "apache-theme" ])); + environments = import ./environments/default.nix { inherit (pkgs) callPackage; }; + lib = { + inherit (mypkgs) composerEnv sources; + inherit (mypkgs.webapps) apache-theme; + }; + }; + flake = { + mylibs = import ./lib/default.nix; + sources = import ./sources/sources.nix; + overlays = import ./overlays/default.nix { forFlakes = true; inherit (self) sources mylibs; } // { + mypkgs = final: prev: self.packages."${final.system}"; + }; + }; + }; +} diff --git a/flakes/mypackages/lib/default.nix b/flakes/mypackages/lib/default.nix new file mode 100644 index 0000000..c28077d --- /dev/null +++ b/flakes/mypackages/lib/default.nix @@ -0,0 +1,4 @@ +{ + flakePartsAddPerSystem = import ./flake-parts-lib.nix; + nodeEnv = import ./node-env.nix; +} diff --git a/flakes/mypackages/lib/flake-parts-lib.nix b/flakes/mypackages/lib/flake-parts-lib.nix new file mode 100644 index 0000000..271a4cf --- /dev/null +++ b/flakes/mypackages/lib/flake-parts-lib.nix @@ -0,0 +1,10 @@ +i@{ name, type }: +{ lib, flake-parts-lib, ... }: +flake-parts-lib.mkTransposedPerSystemModule { + inherit name; + option = lib.mkOption { + type = lib.types.lazyAttrsOf lib.types."${type}"; + default = { }; + }; + file = import ./flake-parts-lib.nix i; +} diff --git a/flakes/mypackages/lib/flake.lock b/flakes/mypackages/lib/flake.lock new file mode 100644 index 0000000..5999137 --- /dev/null +++ b/flakes/mypackages/lib/flake.lock @@ -0,0 +1,7 @@ +{ + "nodes": { + "root": {} + }, + "root": "root", + "version": 7 +} diff --git a/lib/node-env.nix b/flakes/mypackages/lib/node-env.nix similarity index 100% rename from lib/node-env.nix rename to flakes/mypackages/lib/node-env.nix diff --git a/lib/private/default.nix b/flakes/mypackages/lib/private/default.nix similarity index 100% rename from lib/private/default.nix rename to flakes/mypackages/lib/private/default.nix diff --git a/overlays/bitlbee-discord/default.nix b/flakes/mypackages/overlays/bitlbee-discord/default.nix similarity index 100% rename from overlays/bitlbee-discord/default.nix rename to flakes/mypackages/overlays/bitlbee-discord/default.nix diff --git a/overlays/bitlbee/bitlbee_long_nicks.patch b/flakes/mypackages/overlays/bitlbee/bitlbee_long_nicks.patch similarity index 100% rename from overlays/bitlbee/bitlbee_long_nicks.patch rename to flakes/mypackages/overlays/bitlbee/bitlbee_long_nicks.patch diff --git a/overlays/bitlbee/default.nix b/flakes/mypackages/overlays/bitlbee/default.nix similarity index 100% rename from overlays/bitlbee/default.nix rename to flakes/mypackages/overlays/bitlbee/default.nix diff --git a/overlays/bonfire/default.nix b/flakes/mypackages/overlays/bonfire/default.nix similarity index 100% rename from overlays/bonfire/default.nix rename to flakes/mypackages/overlays/bonfire/default.nix diff --git a/overlays/bugwarrior/default.nix b/flakes/mypackages/overlays/bugwarrior/default.nix similarity index 100% rename from overlays/bugwarrior/default.nix rename to flakes/mypackages/overlays/bugwarrior/default.nix diff --git a/overlays/bugwarrior/mantisbt.patch b/flakes/mypackages/overlays/bugwarrior/mantisbt.patch similarity index 100% rename from overlays/bugwarrior/mantisbt.patch rename to flakes/mypackages/overlays/bugwarrior/mantisbt.patch diff --git a/overlays/bundix/default.nix b/flakes/mypackages/overlays/bundix/default.nix similarity index 100% rename from overlays/bundix/default.nix rename to flakes/mypackages/overlays/bundix/default.nix diff --git a/overlays/databases/mysql/default.nix b/flakes/mypackages/overlays/databases/mysql/default.nix similarity index 100% rename from overlays/databases/mysql/default.nix rename to flakes/mypackages/overlays/databases/mysql/default.nix diff --git a/overlays/databases/postgresql/default.nix b/flakes/mypackages/overlays/databases/postgresql/default.nix similarity index 100% rename from overlays/databases/postgresql/default.nix rename to flakes/mypackages/overlays/databases/postgresql/default.nix diff --git a/overlays/default.nix b/flakes/mypackages/overlays/default.nix similarity index 59% rename from overlays/default.nix rename to flakes/mypackages/overlays/default.nix index 716a508..d55f679 100644 --- a/overlays/default.nix +++ b/flakes/mypackages/overlays/default.nix @@ -1,22 +1,23 @@ +{ forFlakes ? false, mypkgs ? null, sources, mylibs }: let - flakeCompat = import ../lib/flake-compat.nix; - flakes = builtins.foldl' (a: b: a // b) {} (map (n: (flakeCompat n).overlays) [ - ../flakes/backports - ../flakes/etherpad-lite - ../flakes/grocy - ../flakes/openarc - ../flakes/opendmarc - ../flakes/peertube - ../flakes/diaspora - ../flakes/mastodon - ../flakes/mediagoblin - ../flakes/private/peertube - ../flakes/private/buildbot - ../flakes/private/php + flakes = builtins.foldl' (a: b: a // b) {} (map (n: (builtins.getFlake "path:${builtins.toString n}").overlays) [ + ../../backports + ../../etherpad-lite + ../../grocy + ../../openarc + ../../opendmarc + ../../peertube + ../../diaspora + ../../mastodon + ../../mediagoblin + ../../private/peertube + ../../private/buildbot + ../../private/php ]); -in flakes // { - mylibs = self: super: { mylibs = import ../lib { pkgs = self; }; }; - mypkgs = self: super: import ../pkgs { pkgs = self; }; +in (if forFlakes then {} else flakes) // { + mylibs = self: super: { inherit mylibs; }; + mypkgs = self: super: (if mypkgs == null then {} else mypkgs.override { pkgs = self; }); + sources = self: super: { inherit sources; }; bitlbee = import ./bitlbee; bitlbee-discord = import ./bitlbee-discord; @@ -38,7 +39,6 @@ in flakes // { postfix = import ./postfix; postgresql = import ./databases/postgresql; procps = import ./procps-ng; - shaarli = import ./shaarli; slrn = import ./slrn; vcsh = import ./vcsh; weechat = import ./weechat; diff --git a/overlays/doing/default.nix b/flakes/mypackages/overlays/doing/default.nix similarity index 100% rename from overlays/doing/default.nix rename to flakes/mypackages/overlays/doing/default.nix diff --git a/overlays/dwm/default.nix b/flakes/mypackages/overlays/dwm/default.nix similarity index 100% rename from overlays/dwm/default.nix rename to flakes/mypackages/overlays/dwm/default.nix diff --git a/overlays/dwm/dwm_config.h b/flakes/mypackages/overlays/dwm/dwm_config.h similarity index 100% rename from overlays/dwm/dwm_config.h rename to flakes/mypackages/overlays/dwm/dwm_config.h diff --git a/overlays/elinks/default.nix b/flakes/mypackages/overlays/elinks/default.nix similarity index 100% rename from overlays/elinks/default.nix rename to flakes/mypackages/overlays/elinks/default.nix diff --git a/overlays/gitolite/default.nix b/flakes/mypackages/overlays/gitolite/default.nix similarity index 100% rename from overlays/gitolite/default.nix rename to flakes/mypackages/overlays/gitolite/default.nix diff --git a/overlays/gitolite/invite b/flakes/mypackages/overlays/gitolite/invite similarity index 100% rename from overlays/gitolite/invite rename to flakes/mypackages/overlays/gitolite/invite diff --git a/overlays/gitweb/default.nix b/flakes/mypackages/overlays/gitweb/default.nix similarity index 100% rename from overlays/gitweb/default.nix rename to flakes/mypackages/overlays/gitweb/default.nix diff --git a/overlays/gitweb/theme/git-favicon.png b/flakes/mypackages/overlays/gitweb/theme/git-favicon.png similarity index 100% rename from overlays/gitweb/theme/git-favicon.png rename to flakes/mypackages/overlays/gitweb/theme/git-favicon.png diff --git a/overlays/gitweb/theme/git-logo.png b/flakes/mypackages/overlays/gitweb/theme/git-logo.png similarity index 100% rename from overlays/gitweb/theme/git-logo.png rename to flakes/mypackages/overlays/gitweb/theme/git-logo.png diff --git a/overlays/gitweb/theme/gitweb.css b/flakes/mypackages/overlays/gitweb/theme/gitweb.css similarity index 100% rename from overlays/gitweb/theme/gitweb.css rename to flakes/mypackages/overlays/gitweb/theme/gitweb.css diff --git a/overlays/gitweb/theme/gitweb.js b/flakes/mypackages/overlays/gitweb/theme/gitweb.js similarity index 100% rename from overlays/gitweb/theme/gitweb.js rename to flakes/mypackages/overlays/gitweb/theme/gitweb.js diff --git a/overlays/goaccess/default.nix b/flakes/mypackages/overlays/goaccess/default.nix similarity index 100% rename from overlays/goaccess/default.nix rename to flakes/mypackages/overlays/goaccess/default.nix diff --git a/overlays/kanboard/default.nix b/flakes/mypackages/overlays/kanboard/default.nix similarity index 100% rename from overlays/kanboard/default.nix rename to flakes/mypackages/overlays/kanboard/default.nix diff --git a/overlays/ledger/default.nix b/flakes/mypackages/overlays/ledger/default.nix similarity index 100% rename from overlays/ledger/default.nix rename to flakes/mypackages/overlays/ledger/default.nix diff --git a/overlays/lesspipe/default.nix b/flakes/mypackages/overlays/lesspipe/default.nix similarity index 100% rename from overlays/lesspipe/default.nix rename to flakes/mypackages/overlays/lesspipe/default.nix diff --git a/overlays/morph/default.nix b/flakes/mypackages/overlays/morph/default.nix similarity index 100% rename from overlays/morph/default.nix rename to flakes/mypackages/overlays/morph/default.nix diff --git a/overlays/morph/dry-run.patch b/flakes/mypackages/overlays/morph/dry-run.patch similarity index 100% rename from overlays/morph/dry-run.patch rename to flakes/mypackages/overlays/morph/dry-run.patch diff --git a/overlays/morph/verbose_nix.patch b/flakes/mypackages/overlays/morph/verbose_nix.patch similarity index 100% rename from overlays/morph/verbose_nix.patch rename to flakes/mypackages/overlays/morph/verbose_nix.patch diff --git a/overlays/neomutt/default.nix b/flakes/mypackages/overlays/neomutt/default.nix similarity index 100% rename from overlays/neomutt/default.nix rename to flakes/mypackages/overlays/neomutt/default.nix diff --git a/overlays/neomutt/tx.patch b/flakes/mypackages/overlays/neomutt/tx.patch similarity index 100% rename from overlays/neomutt/tx.patch rename to flakes/mypackages/overlays/neomutt/tx.patch diff --git a/overlays/nix-direnv/default.nix b/flakes/mypackages/overlays/nix-direnv/default.nix similarity index 100% rename from overlays/nix-direnv/default.nix rename to flakes/mypackages/overlays/nix-direnv/default.nix diff --git a/overlays/pass/default.nix b/flakes/mypackages/overlays/pass/default.nix similarity index 100% rename from overlays/pass/default.nix rename to flakes/mypackages/overlays/pass/default.nix diff --git a/overlays/pass/pass-fix-pass-init.patch b/flakes/mypackages/overlays/pass/pass-fix-pass-init.patch similarity index 100% rename from overlays/pass/pass-fix-pass-init.patch rename to flakes/mypackages/overlays/pass/pass-fix-pass-init.patch diff --git a/overlays/php-packages/default.nix b/flakes/mypackages/overlays/php-packages/default.nix similarity index 100% rename from overlays/php-packages/default.nix rename to flakes/mypackages/overlays/php-packages/default.nix diff --git a/overlays/php-packages/mysqli_patch.patch b/flakes/mypackages/overlays/php-packages/mysqli_patch.patch similarity index 100% rename from overlays/php-packages/mysqli_patch.patch rename to flakes/mypackages/overlays/php-packages/mysqli_patch.patch diff --git a/overlays/postfix/default.nix b/flakes/mypackages/overlays/postfix/default.nix similarity index 100% rename from overlays/postfix/default.nix rename to flakes/mypackages/overlays/postfix/default.nix diff --git a/overlays/procps-ng/default.nix b/flakes/mypackages/overlays/procps-ng/default.nix similarity index 100% rename from overlays/procps-ng/default.nix rename to flakes/mypackages/overlays/procps-ng/default.nix diff --git a/overlays/python-packages/default.nix b/flakes/mypackages/overlays/python-packages/default.nix similarity index 100% rename from overlays/python-packages/default.nix rename to flakes/mypackages/overlays/python-packages/default.nix diff --git a/overlays/slrn/default.nix b/flakes/mypackages/overlays/slrn/default.nix similarity index 100% rename from overlays/slrn/default.nix rename to flakes/mypackages/overlays/slrn/default.nix diff --git a/overlays/taskwarrior/TW-1778_patch.diff b/flakes/mypackages/overlays/taskwarrior/TW-1778_patch.diff similarity index 100% rename from overlays/taskwarrior/TW-1778_patch.diff rename to flakes/mypackages/overlays/taskwarrior/TW-1778_patch.diff diff --git a/overlays/taskwarrior/default.nix b/flakes/mypackages/overlays/taskwarrior/default.nix similarity index 100% rename from overlays/taskwarrior/default.nix rename to flakes/mypackages/overlays/taskwarrior/default.nix diff --git a/overlays/urlwatch/default.nix b/flakes/mypackages/overlays/urlwatch/default.nix similarity index 100% rename from overlays/urlwatch/default.nix rename to flakes/mypackages/overlays/urlwatch/default.nix diff --git a/overlays/vcsh/default.nix b/flakes/mypackages/overlays/vcsh/default.nix similarity index 100% rename from overlays/vcsh/default.nix rename to flakes/mypackages/overlays/vcsh/default.nix diff --git a/overlays/weechat/default.nix b/flakes/mypackages/overlays/weechat/default.nix similarity index 100% rename from overlays/weechat/default.nix rename to flakes/mypackages/overlays/weechat/default.nix diff --git a/flakes/mypackages/overlays/ympd/default.nix b/flakes/mypackages/overlays/ympd/default.nix new file mode 100644 index 0000000..648403f --- /dev/null +++ b/flakes/mypackages/overlays/ympd/default.nix @@ -0,0 +1,14 @@ +self: super: { + ympd = super.ympd.overrideAttrs(old: { + pname = "ympd"; + version = "612f8fc-master"; + src = self.fetchFromGitHub { + owner = "notandy"; + repo = "ympd"; + rev = "612f8fc0b2c47fc89d403e4a044541c6b2b238c8"; + sha256 = "01hnj10zl103mrn82vyd42fvq7w5az3jf1qz18889zv67kn73ll9"; + fetchSubmodules = true; + }; + patches = (old.patches or []) ++ [ ./ympd-password-env.patch ]; + }); +} diff --git a/overlays/ympd/ympd-password-env.patch b/flakes/mypackages/overlays/ympd/ympd-password-env.patch similarity index 100% rename from overlays/ympd/ympd-password-env.patch rename to flakes/mypackages/overlays/ympd/ympd-password-env.patch diff --git a/pkgs/bash-libs/default.nix b/flakes/mypackages/pkgs/bash-libs/default.nix similarity index 100% rename from pkgs/bash-libs/default.nix rename to flakes/mypackages/pkgs/bash-libs/default.nix diff --git a/pkgs/boinctui/default.nix b/flakes/mypackages/pkgs/boinctui/default.nix similarity index 100% rename from pkgs/boinctui/default.nix rename to flakes/mypackages/pkgs/boinctui/default.nix diff --git a/pkgs/cnagios/default.nix b/flakes/mypackages/pkgs/cnagios/default.nix similarity index 60% rename from pkgs/cnagios/default.nix rename to flakes/mypackages/pkgs/cnagios/default.nix index d5b52f3..2b8b0da 100644 --- a/pkgs/cnagios/default.nix +++ b/flakes/mypackages/pkgs/cnagios/default.nix @@ -1,5 +1,15 @@ -{ stdenv, mylibs, perl, ncurses }: -stdenv.mkDerivation (mylibs.fetchedGithub ./cnagios.json // { +{ stdenv, fetchFromGitHub, perl, ncurses }: +stdenv.mkDerivation (rec { + version = "3bd27fb-master"; + pname = "cnagios"; + name = "${pname}-${version}"; + src = fetchFromGitHub { + owner = "dannywarren"; + repo = "cnagios"; + rev = "3bd27fb40e68f61ffd01bea6234b919a667b6fe4"; + sha256 = "0iy5pmlcz6y3if72nav22xqxniiv1v8ywi0927m6s459hkw5n2rb"; + fetchSubmodules = true; + }; configureFlags = [ "--with-etc-dir=/etc/cnagios" "--with-var-dir=/var/lib/naemon" diff --git a/pkgs/commento/default.nix b/flakes/mypackages/pkgs/commento/default.nix similarity index 100% rename from pkgs/commento/default.nix rename to flakes/mypackages/pkgs/commento/default.nix diff --git a/pkgs/composer-env/default.nix b/flakes/mypackages/pkgs/composer-env/default.nix similarity index 98% rename from pkgs/composer-env/default.nix rename to flakes/mypackages/pkgs/composer-env/default.nix index 8631ca8..2dafcc0 100644 --- a/pkgs/composer-env/default.nix +++ b/flakes/mypackages/pkgs/composer-env/default.nix @@ -273,8 +273,4 @@ let ''; } // extraArgs); in -{ - composer = lib.makeOverridable composer; - buildZipPackage = lib.makeOverridable buildZipPackage; - buildPackage = lib.makeOverridable buildPackage; -} +{ inherit composer buildZipPackage buildPackage; } diff --git a/pkgs/crypto/cardano-cli/default.nix b/flakes/mypackages/pkgs/crypto/cardano-cli/default.nix similarity index 100% rename from pkgs/crypto/cardano-cli/default.nix rename to flakes/mypackages/pkgs/crypto/cardano-cli/default.nix diff --git a/pkgs/crypto/cardano/default.nix b/flakes/mypackages/pkgs/crypto/cardano/default.nix similarity index 68% rename from pkgs/crypto/cardano/default.nix rename to flakes/mypackages/pkgs/crypto/cardano/default.nix index 879fddb..8e3c83f 100644 --- a/pkgs/crypto/cardano/default.nix +++ b/flakes/mypackages/pkgs/crypto/cardano/default.nix @@ -1,10 +1,16 @@ -{ stdenv, mylibs }: +{ stdenv, fetchFromGitHub }: let - daedalusSrc = (mylibs.fetchedGithub ./daedalus.json).src; - daedalusOrig = (import daedalusSrc {}).daedalus; + src = fetchFromGitHub { + owner = "input-output-hk"; + repo = "daedalus"; + rev = "998fd3189c9a54fac496dfef7a6224714c67bc80"; + sha256 = "1r3gwfv6hn7lzp4h2s6849m7x12nxadsql358ss615krvdlnb6rr"; + fetchSubmodules = true; + }; + daedalusOrig = (import src {}).daedalus; cfg = stdenv.mkDerivation rec { name = "launcher-config-custom"; - buildInputs = [ daedalusSrc daedalusOrig.cfg ]; + buildInputs = [ src daedalusOrig.cfg ]; src = daedalusOrig.cfg; installPhase = '' cp -a $src $out diff --git a/pkgs/crypto/iota-cli-app/default.nix b/flakes/mypackages/pkgs/crypto/iota-cli-app/default.nix similarity index 54% rename from pkgs/crypto/iota-cli-app/default.nix rename to flakes/mypackages/pkgs/crypto/iota-cli-app/default.nix index e9e9f92..e386489 100644 --- a/pkgs/crypto/iota-cli-app/default.nix +++ b/flakes/mypackages/pkgs/crypto/iota-cli-app/default.nix @@ -1,10 +1,19 @@ -{ stdenv, mylibs, fetchurl, fetchgit, callPackage, nodePackages, nodejs-10_x }: +{ stdenv, mylibs, fetchFromGitHub, fetchurl, fetchgit, callPackage, nodePackages, nodejs-10_x }: let nodeEnv = callPackage mylibs.nodeEnv { nodejs = nodejs-10_x; }; # built using node2nix -8 -l package-lock.json # and changing "./." to "src" packageEnv = import ./node-packages.nix { - src = stdenv.mkDerivation (mylibs.fetchedGithub ./iota-cli-app.json // { + src = stdenv.mkDerivation ({ + pname = "iota-cli-app"; + version = "d7e2e08-master"; + src = fetchFromGitHub { + owner = "iotaledger"; + repo = "cli-app"; + rev = "d7e2e0856ae6bd34890fefb4245c07cd467a5032"; + sha256 = "1n9kczsxdgjv8282nj2grlijvxipiskx0ndn169vz6v1l1hrwc8b"; + fetchSubmodules = true; + }; phases = "installPhase"; installPhase = '' cp -a $src $out diff --git a/pkgs/crypto/iota-cli-app/node-packages.nix b/flakes/mypackages/pkgs/crypto/iota-cli-app/node-packages.nix similarity index 100% rename from pkgs/crypto/iota-cli-app/node-packages.nix rename to flakes/mypackages/pkgs/crypto/iota-cli-app/node-packages.nix diff --git a/pkgs/crypto/sia/default.nix b/flakes/mypackages/pkgs/crypto/sia/default.nix similarity index 100% rename from pkgs/crypto/sia/default.nix rename to flakes/mypackages/pkgs/crypto/sia/default.nix diff --git a/pkgs/default.nix b/flakes/mypackages/pkgs/default.nix similarity index 58% rename from pkgs/default.nix rename to flakes/mypackages/pkgs/default.nix index 67f1dd4..5c30d20 100644 --- a/pkgs/default.nix +++ b/flakes/mypackages/pkgs/default.nix @@ -1,46 +1,45 @@ -{ pkgs }: -with pkgs; +{ forFlakes ? false, pkgs, mylibs, sources, environments }: let - mylibs = import ../lib { inherit pkgs; }; + inherit (pkgs) callPackage python2Packages python38Packages python38; in rec { - sources = import ../nix/sources.nix; - myEnvironments = callPackage ../environments {}; + myEnvironments = environments; bash-libs = callPackage ./bash-libs {}; boinctui = callPackage ./boinctui {}; - cnagios = callPackage ./cnagios { inherit mylibs; }; + cnagios = callPackage ./cnagios {}; commento = callPackage ./commento {}; - flrn = callPackage ./flrn { inherit mylibs; slang = callPackage ./slang_1 {}; }; + flrn = callPackage ./flrn { slang = callPackage ./slang_1 {}; }; fluentd = callPackage ./fluentd {}; fluent-bit = callPackage ./fluent-bit {}; genius = callPackage ./genius {}; ical2html = callPackage ./ical2html {}; mtop = callPackage ./mtop {}; muttprint = callPackage ./muttprint {}; - mutt-ics = callPackage ./mutt-ics { inherit mylibs; }; - nagios-cli = callPackage ./nagios-cli { inherit mylibs; }; - nagnu = callPackage ./nagnu { inherit mylibs; }; + mutt-ics = callPackage ./mutt-ics {}; + nagios-cli = callPackage ./nagios-cli {}; + nagnu = callPackage ./nagnu {}; nb = callPackage ./nb {}; note = callPackage ./note {}; notmuch-python2 = callPackage ./notmuch/notmuch-python { pythonPackages = python2Packages; }; notmuch-python3 = callPackage ./notmuch/notmuch-python { pythonPackages = python38Packages; }; notmuch-vim = callPackage ./notmuch/notmuch-vim {}; perl-ical-parser-html = callPackage ./perl-ical-parser-html {}; - pgpid = callPackage ./pgpid {}; - predixy = callPackage ./predixy { inherit mylibs; }; + pgpid = callPackage ./pgpid { inherit bash-libs; }; + predixy = callPackage ./predixy {}; riotkit-do = callPackage ./riotkit-do {}; rrsync_sudo = callPackage ./rrsync_sudo {}; signaldctl = callPackage ./signaldctl {}; - telegram-history-dump = callPackage ./telegram-history-dump { inherit mylibs; }; - telegramircd = callPackage ./telegramircd { inherit mylibs; telethon = callPackage ./telethon_sync {}; }; + telegram-history-dump = callPackage ./telegram-history-dump {}; + telegramircd = callPackage ./telegramircd { telethon = callPackage ./telethon_sync {}; }; terminal-velocity = callPackage ./terminal-velocity {}; tiv = callPackage ./tiv {}; twins = callPackage ./twins {}; upcmd = callPackage ./upcmd {}; umami = callPackage ./umami {}; unicodeDoc = callPackage ./unicode {}; + shaarli = callPackage ./shaarli {}; - cardano = callPackage ./crypto/cardano { inherit mylibs; }; + cardano = callPackage ./crypto/cardano {}; cardano-cli = callPackage ./crypto/cardano-cli {}; iota-cli-app = callPackage ./crypto/iota-cli-app { inherit mylibs; }; sia = callPackage ./crypto/sia {}; @@ -49,23 +48,18 @@ rec { pure-ftpd = callPackage ./pure-ftpd {}; composerEnv = callPackage ./composer-env {}; - webapps = callPackage ./webapps { inherit mylibs composerEnv; }; + webapps = import ./webapps { inherit forFlakes callPackage mylibs composerEnv sources; }; monitoring-plugins = callPackage ./monitoring-plugins {}; - naemon = callPackage ./naemon { inherit mylibs monitoring-plugins; }; - naemon-livestatus = callPackage ./naemon-livestatus { inherit mylibs naemon; }; + naemon = callPackage ./naemon { inherit monitoring-plugins; }; + naemon-livestatus = callPackage ./naemon-livestatus { inherit naemon; }; gearmand = callPackage ./gearmand {}; status_engine = { - module = callPackage ./status_engine/module.nix { inherit mylibs; }; - worker = callPackage ./status_engine/worker.nix { inherit mylibs composerEnv; }; + module = callPackage ./status_engine/module.nix { inherit gearmand; }; + worker = callPackage ./status_engine/worker.nix { inherit composerEnv gearmand; }; interface = callPackage ./status_engine/interface.nix { inherit composerEnv; }; }; - python3PackagesPlus = callPackage ./python-packages { - python = python38; - inherit mylibs; - }; - dovecot_deleted-to-trash = callPackage ./dovecot/plugins/deleted_to_trash { - inherit mylibs; - }; + python3PackagesPlus = callPackage ./python-packages { python = python38; }; + dovecot_deleted-to-trash = callPackage ./dovecot/plugins/deleted_to_trash {}; } diff --git a/pkgs/dovecot/plugins/deleted_to_trash/default.nix b/flakes/mypackages/pkgs/dovecot/plugins/deleted_to_trash/default.nix similarity index 58% rename from pkgs/dovecot/plugins/deleted_to_trash/default.nix rename to flakes/mypackages/pkgs/dovecot/plugins/deleted_to_trash/default.nix index db1afb5..f270032 100644 --- a/pkgs/dovecot/plugins/deleted_to_trash/default.nix +++ b/flakes/mypackages/pkgs/dovecot/plugins/deleted_to_trash/default.nix @@ -1,6 +1,15 @@ -{ stdenv, fetchurl, dovecot, mylibs, fetchpatch }: +{ stdenv, fetchurl, dovecot, fetchFromGitHub, fetchpatch }: -stdenv.mkDerivation (mylibs.fetchedGithub ./dovecot-deleted_to_trash.json // rec { +stdenv.mkDerivation ({ + pname = "dovecot-deleted_to_trash"; + version = "81b0754-master"; + src = fetchFromGitHub { + owner = "lexbrugman"; + repo = "dovecot_deleted_to_trash"; + rev = "81b07549accfc36467bf8527a53c295c7a02dbb9"; + sha256 = "1b3k31g898s4fa0a9l4kvjsdyds772waaay84sjdxv09jw6mqs0f"; + fetchSubmodules = true; + }; buildInputs = [ dovecot ]; patches = [ (fetchpatch { diff --git a/pkgs/dovecot/plugins/deleted_to_trash/fix_mbox.patch b/flakes/mypackages/pkgs/dovecot/plugins/deleted_to_trash/fix_mbox.patch similarity index 100% rename from pkgs/dovecot/plugins/deleted_to_trash/fix_mbox.patch rename to flakes/mypackages/pkgs/dovecot/plugins/deleted_to_trash/fix_mbox.patch diff --git a/pkgs/flrn/default.nix b/flakes/mypackages/pkgs/flrn/default.nix similarity index 57% rename from pkgs/flrn/default.nix rename to flakes/mypackages/pkgs/flrn/default.nix index f288615..088654c 100644 --- a/pkgs/flrn/default.nix +++ b/flakes/mypackages/pkgs/flrn/default.nix @@ -1,5 +1,14 @@ -{ stdenv, mylibs, libetpan, openssl, autoconf, groff, slang, yacc }: -stdenv.mkDerivation (mylibs.fetchedGithub ./flrn.json // { +{ stdenv, fetchFromGitHub, libetpan, openssl, autoconf, groff, slang, yacc }: +stdenv.mkDerivation (rec { + version = "860d642-master"; + pname = "flrn"; + src = fetchFromGitHub { + owner = "Cigaes"; + repo = "flrn"; + rev = "860d642bd6389a209c8b697bd044f78d23406509"; + sha256 = "0sqlxxpy1xg7cb2hbxcr0al46nyr6jjnns4b5i8w04z5sypa9r5c"; + fetchSubmodules = true; + }; buildInputs = [ libetpan openssl autoconf groff slang yacc ]; preConfigure = '' sed -i -e "s/test -e configure/false/" configure.in diff --git a/pkgs/fluent-bit/default.nix b/flakes/mypackages/pkgs/fluent-bit/default.nix similarity index 100% rename from pkgs/fluent-bit/default.nix rename to flakes/mypackages/pkgs/fluent-bit/default.nix diff --git a/pkgs/fluentd/Gemfile b/flakes/mypackages/pkgs/fluentd/Gemfile similarity index 100% rename from pkgs/fluentd/Gemfile rename to flakes/mypackages/pkgs/fluentd/Gemfile diff --git a/pkgs/fluentd/Gemfile.lock b/flakes/mypackages/pkgs/fluentd/Gemfile.lock similarity index 100% rename from pkgs/fluentd/Gemfile.lock rename to flakes/mypackages/pkgs/fluentd/Gemfile.lock diff --git a/pkgs/fluentd/default.nix b/flakes/mypackages/pkgs/fluentd/default.nix similarity index 100% rename from pkgs/fluentd/default.nix rename to flakes/mypackages/pkgs/fluentd/default.nix diff --git a/pkgs/fluentd/gemset.nix b/flakes/mypackages/pkgs/fluentd/gemset.nix similarity index 100% rename from pkgs/fluentd/gemset.nix rename to flakes/mypackages/pkgs/fluentd/gemset.nix diff --git a/pkgs/gearmand/default.nix b/flakes/mypackages/pkgs/gearmand/default.nix similarity index 100% rename from pkgs/gearmand/default.nix rename to flakes/mypackages/pkgs/gearmand/default.nix diff --git a/pkgs/genius/default.nix b/flakes/mypackages/pkgs/genius/default.nix similarity index 100% rename from pkgs/genius/default.nix rename to flakes/mypackages/pkgs/genius/default.nix diff --git a/pkgs/ical2html/default.nix b/flakes/mypackages/pkgs/ical2html/default.nix similarity index 100% rename from pkgs/ical2html/default.nix rename to flakes/mypackages/pkgs/ical2html/default.nix diff --git a/pkgs/monitoring-plugins/default.nix b/flakes/mypackages/pkgs/monitoring-plugins/default.nix similarity index 100% rename from pkgs/monitoring-plugins/default.nix rename to flakes/mypackages/pkgs/monitoring-plugins/default.nix diff --git a/pkgs/mtop/default.nix b/flakes/mypackages/pkgs/mtop/default.nix similarity index 100% rename from pkgs/mtop/default.nix rename to flakes/mypackages/pkgs/mtop/default.nix diff --git a/flakes/mypackages/pkgs/mutt-ics/default.nix b/flakes/mypackages/pkgs/mutt-ics/default.nix new file mode 100644 index 0000000..2d50475 --- /dev/null +++ b/flakes/mypackages/pkgs/mutt-ics/default.nix @@ -0,0 +1,15 @@ +{ python3Packages, fetchFromGitHub }: +with python3Packages; +buildPythonApplication (rec { + version = "d291187-master"; + pname = "mutt-ics"; + name = "${pname}-${version}"; + src = fetchFromGitHub { + owner = "dmedvinsky"; + repo = "mutt-ics"; + rev = "d29118788f291f67d34fefa6eda9f95846a2fe34"; + sha256 = "0kqzngsvzjq5gpf60jhfmb2xzjznvk172khf4dlcb72n3ak4rb92"; + fetchSubmodules = true; + }; + propagatedBuildInputs = [ icalendar ]; +}) diff --git a/pkgs/muttprint/0.73-4.diff.gz b/flakes/mypackages/pkgs/muttprint/0.73-4.diff.gz similarity index 100% rename from pkgs/muttprint/0.73-4.diff.gz rename to flakes/mypackages/pkgs/muttprint/0.73-4.diff.gz diff --git a/pkgs/muttprint/default.nix b/flakes/mypackages/pkgs/muttprint/default.nix similarity index 100% rename from pkgs/muttprint/default.nix rename to flakes/mypackages/pkgs/muttprint/default.nix diff --git a/pkgs/muttprint/regex.patch b/flakes/mypackages/pkgs/muttprint/regex.patch similarity index 100% rename from pkgs/muttprint/regex.patch rename to flakes/mypackages/pkgs/muttprint/regex.patch diff --git a/pkgs/muttprint/two_edge.patch b/flakes/mypackages/pkgs/muttprint/two_edge.patch similarity index 100% rename from pkgs/muttprint/two_edge.patch rename to flakes/mypackages/pkgs/muttprint/two_edge.patch diff --git a/pkgs/naemon-livestatus/default.nix b/flakes/mypackages/pkgs/naemon-livestatus/default.nix similarity index 56% rename from pkgs/naemon-livestatus/default.nix rename to flakes/mypackages/pkgs/naemon-livestatus/default.nix index 46ef51a..623230a 100644 --- a/pkgs/naemon-livestatus/default.nix +++ b/flakes/mypackages/pkgs/naemon-livestatus/default.nix @@ -1,9 +1,18 @@ -{ stdenv, mylibs, autoconf, automake, +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config, naemon, varDir ? "/var/lib/naemon", etcDir ? "/etc/naemon" }: -stdenv.mkDerivation (mylibs.fetchedGithub ./naemon-livestatus.json // { +stdenv.mkDerivation ({ + pname = "naemon-livestatus"; + version = "33dbcfe-master"; + src = fetchFromGitHub { + owner = "naemon"; + repo = "naemon-livestatus"; + rev = "33dbcfe18e42158f25c27cff95a1e07b73be53b0"; + sha256 = "16jk0c6pwr7ck0g6s12hj6czbhgdr7c7f74zzsp5279af86y8fd6"; + fetchSubmodules = true; + }; preConfigure = '' ./autogen.sh || true ''; diff --git a/pkgs/naemon/default.nix b/flakes/mypackages/pkgs/naemon/default.nix similarity index 70% rename from pkgs/naemon/default.nix rename to flakes/mypackages/pkgs/naemon/default.nix index 0341296..2a29bdc 100644 --- a/pkgs/naemon/default.nix +++ b/flakes/mypackages/pkgs/naemon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mylibs, help2man, monitoring-plugins, autoconf, automake, +{ stdenv, fetchFromGitHub, help2man, monitoring-plugins, autoconf, automake, libtool, glib, pkg-config, gperf, varDir ? "/var/lib/naemon", etcDir ? "/etc/naemon", @@ -8,7 +8,16 @@ user ? "naemon", group ? "naemon" }: -stdenv.mkDerivation (mylibs.fetchedGithub ./naemon.json // { +stdenv.mkDerivation ({ + pname = "naemon"; + version = "d7ac1c8-master"; + src = fetchFromGitHub { + owner = "naemon"; + repo = "naemon-core"; + rev = "d7ac1c824e01dbb1c4a6bd0550b324e7cf165d54"; + sha256 = "003grwciplnqfn9jh2km2pm6xxp8fxvmwihg3vmch8f0vfwcmv1m"; + fetchSubmodules = true; + }; passthru.status_engine_version = "1-1-0"; preConfigure = '' ./autogen.sh || true diff --git a/flakes/mypackages/pkgs/nagios-cli/default.nix b/flakes/mypackages/pkgs/nagios-cli/default.nix new file mode 100644 index 0000000..99ae843 --- /dev/null +++ b/flakes/mypackages/pkgs/nagios-cli/default.nix @@ -0,0 +1,12 @@ +{ python2Packages, fetchFromGitHub }: +python2Packages.buildPythonApplication rec { + version = "edc51ea-master"; + pname = "nagios-cli"; + src = fetchFromGitHub { + owner = "tehmaze"; + repo = "nagios-cli"; + rev = "edc51eaccf1086bb4469ce45c5e5155f2d71a2f9"; + sha256 = "1qw5fv4niz079zqwmfr3kzjv8cc31rbhi9whdbv9c32qdi3h7vsp"; + fetchSubmodules = true; + }; +} diff --git a/flakes/mypackages/pkgs/nagnu/default.nix b/flakes/mypackages/pkgs/nagnu/default.nix new file mode 100644 index 0000000..c7a1162 --- /dev/null +++ b/flakes/mypackages/pkgs/nagnu/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchFromGitHub, ncurses, curl }: +stdenv.mkDerivation (rec { + pname = "nagnu"; + version = "c7e65fc-master"; + src = fetchFromGitHub { + owner = "frlen"; + repo = "nagnu"; + rev = "c7e65fc02f46a3756a4cc47953ea2f3e57a84728"; + sha256 = "1i2jm8ibvqcc734daamnzc3hx8q0nsry1x12q0kr5yvcsdjjgyy3"; + fetchSubmodules = true; + }; + 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 + ''; +}) diff --git a/pkgs/nb/default.nix b/flakes/mypackages/pkgs/nb/default.nix similarity index 100% rename from pkgs/nb/default.nix rename to flakes/mypackages/pkgs/nb/default.nix diff --git a/pkgs/note/default.nix b/flakes/mypackages/pkgs/note/default.nix similarity index 100% rename from pkgs/note/default.nix rename to flakes/mypackages/pkgs/note/default.nix diff --git a/pkgs/notmuch/notmuch-python/default.nix b/flakes/mypackages/pkgs/notmuch/notmuch-python/default.nix similarity index 100% rename from pkgs/notmuch/notmuch-python/default.nix rename to flakes/mypackages/pkgs/notmuch/notmuch-python/default.nix diff --git a/pkgs/notmuch/notmuch-vim/default.nix b/flakes/mypackages/pkgs/notmuch/notmuch-vim/default.nix similarity index 100% rename from pkgs/notmuch/notmuch-vim/default.nix rename to flakes/mypackages/pkgs/notmuch/notmuch-vim/default.nix diff --git a/pkgs/perl-ical-parser-html/default.nix b/flakes/mypackages/pkgs/perl-ical-parser-html/default.nix similarity index 84% rename from pkgs/perl-ical-parser-html/default.nix rename to flakes/mypackages/pkgs/perl-ical-parser-html/default.nix index 5f2dcca..96e9abc 100644 --- a/pkgs/perl-ical-parser-html/default.nix +++ b/flakes/mypackages/pkgs/perl-ical-parser-html/default.nix @@ -1,7 +1,8 @@ { perlPackages, fetchurl }: let TestXML = perlPackages.buildPerlPackage rec { - name = "Test-XML-0.08"; + pname = "Test-XML"; + version = "0.08"; src = fetchurl { url = "mirror://cpan/authors/id/S/SE/SEMANTICO/Test-XML-0.08.tar.gz"; sha256 = "sha256-61TMI83shg062KyKaXy/A40N7JUimRLZdcMBiQyoPuI="; @@ -11,7 +12,8 @@ let ]; }; iCalParserSAX = perlPackages.buildPerlPackage rec { - name = "iCal-Parser-SAX-1.09"; + pname = "iCal-Parser-SAX"; + version = "1.09"; src = fetchurl { url = "mirror://cpan/authors/id/R/RF/RFRANKEL/iCal-Parser-SAX-1.09.tar.gz"; sha256 = "sha256-fouAjQ+MTUgwZ/j3dIarOK0rVBZcZy6aOJFor4pLql0="; @@ -25,9 +27,10 @@ let }; in perlPackages.buildPerlPackage rec { - name = "iCal-Parser-HTML-1.07"; + pname = "iCal-Parser-HTML"; + version = "1.07"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RF/RFRANKEL/${name}.tar.gz"; + url = "mirror://cpan/authors/id/R/RF/RFRANKEL/${pname}-${version}.tar.gz"; sha256 = "sha256-cxRS2M6aVrCtAXHQae0Y6EtEfGnGx41UuB7z442NSrU="; }; patchPhase = '' diff --git a/pkgs/pgpid/default.nix b/flakes/mypackages/pkgs/pgpid/default.nix similarity index 100% rename from pkgs/pgpid/default.nix rename to flakes/mypackages/pkgs/pgpid/default.nix diff --git a/flakes/mypackages/pkgs/predixy/default.nix b/flakes/mypackages/pkgs/predixy/default.nix new file mode 100644 index 0000000..259d7fd --- /dev/null +++ b/flakes/mypackages/pkgs/predixy/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchFromGitHub }: +stdenv.mkDerivation ({ + pname = "predixy"; + version = "dacf3fb-master"; + src = fetchFromGitHub { + owner = "joyieldInc"; + repo = "predixy"; + rev = "dacf3fb30c2602dc044040df04e194d44b49c1be"; + sha256 = "0sbvy0jg551lwkfq8qh0a49cl9mhfnkhi3cnk25l8pz4jcdrr9k9"; + fetchSubmodules = true; + }; + installPhase = '' + mkdir -p $out/bin + cp src/predixy $out/bin + mkdir -p $out/share + cp -r doc $out/share + cp -r conf $out/share/doc + ''; +}) diff --git a/pkgs/proftpd/default.nix b/flakes/mypackages/pkgs/proftpd/default.nix similarity index 100% rename from pkgs/proftpd/default.nix rename to flakes/mypackages/pkgs/proftpd/default.nix diff --git a/pkgs/pure-ftpd/default.nix b/flakes/mypackages/pkgs/pure-ftpd/default.nix similarity index 100% rename from pkgs/pure-ftpd/default.nix rename to flakes/mypackages/pkgs/pure-ftpd/default.nix diff --git a/pkgs/python-packages/blivet/default.nix b/flakes/mypackages/pkgs/python-packages/blivet/default.nix similarity index 100% rename from pkgs/python-packages/blivet/default.nix rename to flakes/mypackages/pkgs/python-packages/blivet/default.nix diff --git a/pkgs/python-packages/blivet/fix_path.patch b/flakes/mypackages/pkgs/python-packages/blivet/fix_path.patch similarity index 100% rename from pkgs/python-packages/blivet/fix_path.patch rename to flakes/mypackages/pkgs/python-packages/blivet/fix_path.patch diff --git a/pkgs/python-packages/blivet/poetry.lock b/flakes/mypackages/pkgs/python-packages/blivet/poetry.lock similarity index 100% rename from pkgs/python-packages/blivet/poetry.lock rename to flakes/mypackages/pkgs/python-packages/blivet/poetry.lock diff --git a/pkgs/python-packages/blivet/pyproject.toml b/flakes/mypackages/pkgs/python-packages/blivet/pyproject.toml similarity index 100% rename from pkgs/python-packages/blivet/pyproject.toml rename to flakes/mypackages/pkgs/python-packages/blivet/pyproject.toml diff --git a/pkgs/python-packages/default.nix b/flakes/mypackages/pkgs/python-packages/default.nix similarity index 88% rename from pkgs/python-packages/default.nix rename to flakes/mypackages/pkgs/python-packages/default.nix index 21c4204..f0c783a 100644 --- a/pkgs/python-packages/default.nix +++ b/flakes/mypackages/pkgs/python-packages/default.nix @@ -1,4 +1,4 @@ -{ mylibs, callPackage, python }: +{ callPackage, python }: { blivet3 = callPackage ./blivet { inherit python; pythonPackages = python.pkgs; }; pymilter = callPackage ./pymilter.nix { pythonPackages = python.pkgs; }; diff --git a/pkgs/python-packages/matrix-webhook.nix b/flakes/mypackages/pkgs/python-packages/matrix-webhook.nix similarity index 100% rename from pkgs/python-packages/matrix-webhook.nix rename to flakes/mypackages/pkgs/python-packages/matrix-webhook.nix diff --git a/pkgs/python-packages/pymilter.nix b/flakes/mypackages/pkgs/python-packages/pymilter.nix similarity index 100% rename from pkgs/python-packages/pymilter.nix rename to flakes/mypackages/pkgs/python-packages/pymilter.nix diff --git a/pkgs/riotkit-do/default.nix b/flakes/mypackages/pkgs/riotkit-do/default.nix similarity index 100% rename from pkgs/riotkit-do/default.nix rename to flakes/mypackages/pkgs/riotkit-do/default.nix diff --git a/pkgs/rrsync_sudo/default.nix b/flakes/mypackages/pkgs/rrsync_sudo/default.nix similarity index 100% rename from pkgs/rrsync_sudo/default.nix rename to flakes/mypackages/pkgs/rrsync_sudo/default.nix diff --git a/pkgs/rrsync_sudo/sudo.patch b/flakes/mypackages/pkgs/rrsync_sudo/sudo.patch similarity index 100% rename from pkgs/rrsync_sudo/sudo.patch rename to flakes/mypackages/pkgs/rrsync_sudo/sudo.patch diff --git a/pkgs/shaarli/default.nix b/flakes/mypackages/pkgs/shaarli/default.nix similarity index 100% rename from pkgs/shaarli/default.nix rename to flakes/mypackages/pkgs/shaarli/default.nix diff --git a/overlays/shaarli/shaarli_ldap.patch b/flakes/mypackages/pkgs/shaarli/shaarli_ldap.patch similarity index 100% rename from overlays/shaarli/shaarli_ldap.patch rename to flakes/mypackages/pkgs/shaarli/shaarli_ldap.patch diff --git a/pkgs/signaldctl/default.nix b/flakes/mypackages/pkgs/signaldctl/default.nix similarity index 100% rename from pkgs/signaldctl/default.nix rename to flakes/mypackages/pkgs/signaldctl/default.nix diff --git a/pkgs/slang_1/default.nix b/flakes/mypackages/pkgs/slang_1/default.nix similarity index 100% rename from pkgs/slang_1/default.nix rename to flakes/mypackages/pkgs/slang_1/default.nix diff --git a/pkgs/status_engine/host_perfdata.patch b/flakes/mypackages/pkgs/status_engine/host_perfdata.patch similarity index 100% rename from pkgs/status_engine/host_perfdata.patch rename to flakes/mypackages/pkgs/status_engine/host_perfdata.patch diff --git a/pkgs/status_engine/interface.nix b/flakes/mypackages/pkgs/status_engine/interface.nix similarity index 100% rename from pkgs/status_engine/interface.nix rename to flakes/mypackages/pkgs/status_engine/interface.nix diff --git a/pkgs/status_engine/interface_composer.lock b/flakes/mypackages/pkgs/status_engine/interface_composer.lock similarity index 100% rename from pkgs/status_engine/interface_composer.lock rename to flakes/mypackages/pkgs/status_engine/interface_composer.lock diff --git a/pkgs/status_engine/interface_php_packages.nix b/flakes/mypackages/pkgs/status_engine/interface_php_packages.nix similarity index 100% rename from pkgs/status_engine/interface_php_packages.nix rename to flakes/mypackages/pkgs/status_engine/interface_php_packages.nix diff --git a/flakes/mypackages/pkgs/status_engine/module.nix b/flakes/mypackages/pkgs/status_engine/module.nix new file mode 100644 index 0000000..d3ac03e --- /dev/null +++ b/flakes/mypackages/pkgs/status_engine/module.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchFromGitHub, gearmand, json_c, libuuid, libevent, pkgconfig, glib }: +stdenv.mkDerivation ({ + pname = "statusengine-module"; + version = "d461e95-master"; + src = fetchFromGitHub { + owner = "statusengine"; + repo = "module"; + rev = "d461e95a11fffaac604d11ac42d237b5e13071bc"; + sha256 = "1awmq9rck9xy82pambnd2wh66ndif8x8jpk4qbbghs9f2sd48x1n"; + fetchSubmodules = true; + }; + patches = [ ./host_perfdata.patch ]; + buildInputs = [ gearmand json_c libuuid libevent pkgconfig glib ]; + makeFlags = "all"; + installPhase = '' + mkdir -p $out/lib/status-engine + cp -a src/bin/* $out/lib/status-engine + ''; +}) diff --git a/pkgs/status_engine/worker.nix b/flakes/mypackages/pkgs/status_engine/worker.nix similarity index 54% rename from pkgs/status_engine/worker.nix rename to flakes/mypackages/pkgs/status_engine/worker.nix index eb9ae7b..160e1dd 100644 --- a/pkgs/status_engine/worker.nix +++ b/flakes/mypackages/pkgs/status_engine/worker.nix @@ -1,4 +1,4 @@ -{ stdenv, mylibs, composerEnv, fetchurl, gearmand, callPackage, php74, config_file ? "/var/lib/status_engine/ui.yml" }: +{ stdenv, fetchFromGitHub, composerEnv, fetchurl, gearmand, callPackage, php74, config_file ? "/var/lib/status_engine/ui.yml" }: let gearman = php74.buildPecl rec { version = "2.1.0"; @@ -13,12 +13,22 @@ let in (composerEnv.override { php = php74.withExtensions({ enabled, all }: enabled ++ (with all; [gearman redis mbstring bcmath json iconv])); -}).buildPackage (mylibs.fetchedGithub ./worker.json // +}).buildPackage ( import ./worker_php_packages.nix { inherit composerEnv fetchurl; } // rec { + name = "${pname}-${version}"; + pname = "worker"; + version = "02267d4-master"; + src = fetchFromGitHub { + owner = "statusengine"; + repo = "worker"; + rev = "02267d495ae69137d6765dc6b0f453f80216f1cf"; + sha256 = "06ci4mkmifdf1z15yc8rxl44ppi45vjz4s136yaccq9d8vk9iyd4"; + fetchSubmodules = true; + }; postInstall = '' ln -s ${config_file} $out/etc/config.yml - ''; - preInstall = '' - cp ${./worker_composer.lock} $out/composer.lock + ''; + preInstall = '' + cp ${./worker_composer.lock} $out/composer.lock ''; }) diff --git a/pkgs/status_engine/worker_composer.lock b/flakes/mypackages/pkgs/status_engine/worker_composer.lock similarity index 100% rename from pkgs/status_engine/worker_composer.lock rename to flakes/mypackages/pkgs/status_engine/worker_composer.lock diff --git a/pkgs/status_engine/worker_php_packages.nix b/flakes/mypackages/pkgs/status_engine/worker_php_packages.nix similarity index 100% rename from pkgs/status_engine/worker_php_packages.nix rename to flakes/mypackages/pkgs/status_engine/worker_php_packages.nix diff --git a/flakes/mypackages/pkgs/telegram-history-dump/default.nix b/flakes/mypackages/pkgs/telegram-history-dump/default.nix new file mode 100644 index 0000000..492e265 --- /dev/null +++ b/flakes/mypackages/pkgs/telegram-history-dump/default.nix @@ -0,0 +1,18 @@ +{ stdenv, ruby, fetchFromGitHub }: +stdenv.mkDerivation ({ + pname = "telegram-history-dump"; + version = "468ea91-master"; + src = fetchFromGitHub { + owner = "tvdstaaij"; + repo = "telegram-history-dump"; + rev = "468ea91e543529b54bc2c5ea28b1ea17f362fd3e"; + sha256 = "1wmwiqacfa56bmwx50njnb15cg0fy6rbdrmrjd4xfbh8bs6yp0gh"; + fetchSubmodules = true; + }; + installPhase = '' + mkdir -p $out/lib $out/bin + cp -a $src $out/lib/telegram-history-dump + ln -s $out/lib/telegram-history-dump/telegram-history-dump.rb $out/bin/telegram-history-dump + ''; + buildInputs = [ ruby ]; +}) diff --git a/pkgs/telegramircd/default.nix b/flakes/mypackages/pkgs/telegramircd/default.nix similarity index 62% rename from pkgs/telegramircd/default.nix rename to flakes/mypackages/pkgs/telegramircd/default.nix index 2f1d7ca..d9196a2 100644 --- a/pkgs/telegramircd/default.nix +++ b/flakes/mypackages/pkgs/telegramircd/default.nix @@ -1,11 +1,17 @@ -{ openssl, telethon, python3Packages, mylibs }: +{ openssl, telethon, python3Packages, fetchFromGitHub }: with python3Packages; buildPythonApplication rec { format = "other"; pname = "telegramircd"; version = "master"; propagatedBuildInputs = [ telethon aiohttp ConfigArgParse openssl ]; - src = (mylibs.fetchedGithub ./telegramircd.json).src; + src = fetchFromGitHub { + owner = "MaskRay"; + repo = "telegramircd"; + rev = "40a0c7cf60492bde3f44d43f06f62e3792480139"; + sha256 = "123fjhgxq2fzn0ar8274jv7jjbxnlpidrj5333kbch7rpcipks0y"; + fetchSubmodules = true; + }; LD_LIBRARY_PATH = "${openssl.out}/lib"; installPhase = '' install -D $src/telegramircd.py $out/bin/telegramircd diff --git a/pkgs/telethon_sync/default.nix b/flakes/mypackages/pkgs/telethon_sync/default.nix similarity index 100% rename from pkgs/telethon_sync/default.nix rename to flakes/mypackages/pkgs/telethon_sync/default.nix diff --git a/pkgs/terminal-velocity/default.nix b/flakes/mypackages/pkgs/terminal-velocity/default.nix similarity index 100% rename from pkgs/terminal-velocity/default.nix rename to flakes/mypackages/pkgs/terminal-velocity/default.nix diff --git a/pkgs/terminal-velocity/fix_build.patch b/flakes/mypackages/pkgs/terminal-velocity/fix_build.patch similarity index 100% rename from pkgs/terminal-velocity/fix_build.patch rename to flakes/mypackages/pkgs/terminal-velocity/fix_build.patch diff --git a/pkgs/terminal-velocity/python3_support.patch b/flakes/mypackages/pkgs/terminal-velocity/python3_support.patch similarity index 100% rename from pkgs/terminal-velocity/python3_support.patch rename to flakes/mypackages/pkgs/terminal-velocity/python3_support.patch diff --git a/pkgs/terminal-velocity/sort_found_notes.patch b/flakes/mypackages/pkgs/terminal-velocity/sort_found_notes.patch similarity index 100% rename from pkgs/terminal-velocity/sort_found_notes.patch rename to flakes/mypackages/pkgs/terminal-velocity/sort_found_notes.patch diff --git a/pkgs/tiv/default.nix b/flakes/mypackages/pkgs/tiv/default.nix similarity index 100% rename from pkgs/tiv/default.nix rename to flakes/mypackages/pkgs/tiv/default.nix diff --git a/pkgs/tiv/tiv_builder.sh b/flakes/mypackages/pkgs/tiv/tiv_builder.sh similarity index 100% rename from pkgs/tiv/tiv_builder.sh rename to flakes/mypackages/pkgs/tiv/tiv_builder.sh diff --git a/pkgs/twins/default.nix b/flakes/mypackages/pkgs/twins/default.nix similarity index 100% rename from pkgs/twins/default.nix rename to flakes/mypackages/pkgs/twins/default.nix diff --git a/pkgs/umami/build-geo.patch b/flakes/mypackages/pkgs/umami/build-geo.patch similarity index 100% rename from pkgs/umami/build-geo.patch rename to flakes/mypackages/pkgs/umami/build-geo.patch diff --git a/pkgs/umami/default.nix b/flakes/mypackages/pkgs/umami/default.nix similarity index 100% rename from pkgs/umami/default.nix rename to flakes/mypackages/pkgs/umami/default.nix diff --git a/pkgs/unicode/default.nix b/flakes/mypackages/pkgs/unicode/default.nix similarity index 100% rename from pkgs/unicode/default.nix rename to flakes/mypackages/pkgs/unicode/default.nix diff --git a/pkgs/upcmd/default.nix b/flakes/mypackages/pkgs/upcmd/default.nix similarity index 100% rename from pkgs/upcmd/default.nix rename to flakes/mypackages/pkgs/upcmd/default.nix diff --git a/pkgs/webapps/adminer/default.nix b/flakes/mypackages/pkgs/webapps/adminer/default.nix similarity index 100% rename from pkgs/webapps/adminer/default.nix rename to flakes/mypackages/pkgs/webapps/adminer/default.nix diff --git a/pkgs/webapps/apache-theme/default.nix b/flakes/mypackages/pkgs/webapps/apache-theme/default.nix similarity index 100% rename from pkgs/webapps/apache-theme/default.nix rename to flakes/mypackages/pkgs/webapps/apache-theme/default.nix diff --git a/pkgs/webapps/apache-theme/theme/.htaccess b/flakes/mypackages/pkgs/webapps/apache-theme/theme/.htaccess similarity index 100% rename from pkgs/webapps/apache-theme/theme/.htaccess rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/.htaccess diff --git a/pkgs/webapps/apache-theme/theme/footer.html b/flakes/mypackages/pkgs/webapps/apache-theme/theme/footer.html similarity index 100% rename from pkgs/webapps/apache-theme/theme/footer.html rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/footer.html diff --git a/pkgs/webapps/apache-theme/theme/header.html b/flakes/mypackages/pkgs/webapps/apache-theme/theme/header.html similarity index 100% rename from pkgs/webapps/apache-theme/theme/header.html rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/header.html diff --git a/pkgs/webapps/apache-theme/theme/icons/archive.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/archive.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/archive.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/archive.png diff --git a/pkgs/webapps/apache-theme/theme/icons/audio.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/audio.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/audio.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/audio.png diff --git a/pkgs/webapps/apache-theme/theme/icons/authors.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/authors.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/authors.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/authors.png diff --git a/pkgs/webapps/apache-theme/theme/icons/bin.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/bin.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/bin.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/bin.png diff --git a/pkgs/webapps/apache-theme/theme/icons/blank.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/blank.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/blank.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/blank.png diff --git a/pkgs/webapps/apache-theme/theme/icons/bmp.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/bmp.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/bmp.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/bmp.png diff --git a/pkgs/webapps/apache-theme/theme/icons/c.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/c.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/c.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/c.png diff --git a/pkgs/webapps/apache-theme/theme/icons/calc.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/calc.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/calc.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/calc.png diff --git a/pkgs/webapps/apache-theme/theme/icons/cd.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/cd.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/cd.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/cd.png diff --git a/pkgs/webapps/apache-theme/theme/icons/copying.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/copying.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/copying.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/copying.png diff --git a/pkgs/webapps/apache-theme/theme/icons/cpp.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/cpp.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/cpp.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/cpp.png diff --git a/pkgs/webapps/apache-theme/theme/icons/css.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/css.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/css.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/css.png diff --git a/pkgs/webapps/apache-theme/theme/icons/deb.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/deb.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/deb.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/deb.png diff --git a/pkgs/webapps/apache-theme/theme/icons/default.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/default.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/default.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/default.png diff --git a/pkgs/webapps/apache-theme/theme/icons/diff.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/diff.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/diff.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/diff.png diff --git a/pkgs/webapps/apache-theme/theme/icons/doc.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/doc.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/doc.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/doc.png diff --git a/pkgs/webapps/apache-theme/theme/icons/draw.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/draw.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/draw.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/draw.png diff --git a/pkgs/webapps/apache-theme/theme/icons/eps.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/eps.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/eps.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/eps.png diff --git a/pkgs/webapps/apache-theme/theme/icons/exe.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/exe.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/exe.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/exe.png diff --git a/pkgs/webapps/apache-theme/theme/icons/folder-home.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/folder-home.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/folder-home.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/folder-home.png diff --git a/pkgs/webapps/apache-theme/theme/icons/folder-open.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/folder-open.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/folder-open.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/folder-open.png diff --git a/pkgs/webapps/apache-theme/theme/icons/folder-page.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/folder-page.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/folder-page.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/folder-page.png diff --git a/pkgs/webapps/apache-theme/theme/icons/folder-parent-old.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/folder-parent-old.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/folder-parent-old.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/folder-parent-old.png diff --git a/pkgs/webapps/apache-theme/theme/icons/folder-parent.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/folder-parent.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/folder-parent.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/folder-parent.png diff --git a/pkgs/webapps/apache-theme/theme/icons/folder.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/folder.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/folder.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/folder.png diff --git a/pkgs/webapps/apache-theme/theme/icons/gif.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/gif.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/gif.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/gif.png diff --git a/pkgs/webapps/apache-theme/theme/icons/gzip.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/gzip.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/gzip.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/gzip.png diff --git a/pkgs/webapps/apache-theme/theme/icons/h.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/h.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/h.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/h.png diff --git a/pkgs/webapps/apache-theme/theme/icons/hpp.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/hpp.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/hpp.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/hpp.png diff --git a/pkgs/webapps/apache-theme/theme/icons/html.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/html.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/html.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/html.png diff --git a/pkgs/webapps/apache-theme/theme/icons/ico.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/ico.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/ico.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/ico.png diff --git a/pkgs/webapps/apache-theme/theme/icons/image.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/image.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/image.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/image.png diff --git a/pkgs/webapps/apache-theme/theme/icons/install.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/install.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/install.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/install.png diff --git a/pkgs/webapps/apache-theme/theme/icons/java.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/java.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/java.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/java.png diff --git a/pkgs/webapps/apache-theme/theme/icons/jpg.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/jpg.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/jpg.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/jpg.png diff --git a/pkgs/webapps/apache-theme/theme/icons/js.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/js.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/js.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/js.png diff --git a/pkgs/webapps/apache-theme/theme/icons/json.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/json.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/json.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/json.png diff --git a/pkgs/webapps/apache-theme/theme/icons/log.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/log.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/log.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/log.png diff --git a/pkgs/webapps/apache-theme/theme/icons/makefile.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/makefile.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/makefile.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/makefile.png diff --git a/pkgs/webapps/apache-theme/theme/icons/markdown.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/markdown.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/markdown.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/markdown.png diff --git a/pkgs/webapps/apache-theme/theme/icons/package.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/package.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/package.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/package.png diff --git a/pkgs/webapps/apache-theme/theme/icons/pdf.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/pdf.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/pdf.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/pdf.png diff --git a/pkgs/webapps/apache-theme/theme/icons/php.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/php.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/php.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/php.png diff --git a/pkgs/webapps/apache-theme/theme/icons/playlist.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/playlist.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/playlist.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/playlist.png diff --git a/pkgs/webapps/apache-theme/theme/icons/png.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/png.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/png.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/png.png diff --git a/pkgs/webapps/apache-theme/theme/icons/pres.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/pres.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/pres.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/pres.png diff --git a/pkgs/webapps/apache-theme/theme/icons/ps.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/ps.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/ps.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/ps.png diff --git a/pkgs/webapps/apache-theme/theme/icons/psd.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/psd.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/psd.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/psd.png diff --git a/pkgs/webapps/apache-theme/theme/icons/py.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/py.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/py.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/py.png diff --git a/pkgs/webapps/apache-theme/theme/icons/rar.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/rar.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/rar.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/rar.png diff --git a/pkgs/webapps/apache-theme/theme/icons/rb.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/rb.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/rb.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/rb.png diff --git a/pkgs/webapps/apache-theme/theme/icons/readme.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/readme.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/readme.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/readme.png diff --git a/pkgs/webapps/apache-theme/theme/icons/rpm.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/rpm.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/rpm.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/rpm.png diff --git a/pkgs/webapps/apache-theme/theme/icons/rss.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/rss.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/rss.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/rss.png diff --git a/pkgs/webapps/apache-theme/theme/icons/rtf.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/rtf.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/rtf.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/rtf.png diff --git a/pkgs/webapps/apache-theme/theme/icons/script.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/script.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/script.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/script.png diff --git a/pkgs/webapps/apache-theme/theme/icons/source.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/source.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/source.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/source.png diff --git a/pkgs/webapps/apache-theme/theme/icons/sql.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/sql.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/sql.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/sql.png diff --git a/pkgs/webapps/apache-theme/theme/icons/tar.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/tar.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/tar.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/tar.png diff --git a/pkgs/webapps/apache-theme/theme/icons/tex.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/tex.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/tex.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/tex.png diff --git a/pkgs/webapps/apache-theme/theme/icons/text.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/text.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/text.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/text.png diff --git a/pkgs/webapps/apache-theme/theme/icons/tiff.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/tiff.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/tiff.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/tiff.png diff --git a/pkgs/webapps/apache-theme/theme/icons/unknown.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/unknown.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/unknown.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/unknown.png diff --git a/pkgs/webapps/apache-theme/theme/icons/vcal.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/vcal.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/vcal.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/vcal.png diff --git a/pkgs/webapps/apache-theme/theme/icons/video.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/video.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/video.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/video.png diff --git a/pkgs/webapps/apache-theme/theme/icons/xml.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/xml.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/xml.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/xml.png diff --git a/pkgs/webapps/apache-theme/theme/icons/zip.png b/flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/zip.png similarity index 100% rename from pkgs/webapps/apache-theme/theme/icons/zip.png rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/icons/zip.png diff --git a/pkgs/webapps/apache-theme/theme/style.css b/flakes/mypackages/pkgs/webapps/apache-theme/theme/style.css similarity index 100% rename from pkgs/webapps/apache-theme/theme/style.css rename to flakes/mypackages/pkgs/webapps/apache-theme/theme/style.css diff --git a/pkgs/webapps/awl/default.nix b/flakes/mypackages/pkgs/webapps/awl/default.nix similarity index 100% rename from pkgs/webapps/awl/default.nix rename to flakes/mypackages/pkgs/webapps/awl/default.nix diff --git a/pkgs/webapps/davical/default.nix b/flakes/mypackages/pkgs/webapps/davical/default.nix similarity index 100% rename from pkgs/webapps/davical/default.nix rename to flakes/mypackages/pkgs/webapps/davical/default.nix diff --git a/flakes/mypackages/pkgs/webapps/default.nix b/flakes/mypackages/pkgs/webapps/default.nix new file mode 100644 index 0000000..2d76147 --- /dev/null +++ b/flakes/mypackages/pkgs/webapps/default.nix @@ -0,0 +1,32 @@ +{ forFlakes, callPackage, mylibs, composerEnv, sources }: +{ + adminer = callPackage ./adminer {}; + apache-theme = import ./apache-theme; + awl = callPackage ./awl {}; + davical = callPackage ./davical {}; + dokuwiki = callPackage ./dokuwiki {}; + infcloud = callPackage ./infcloud {}; + mantisbt_2 = callPackage ./mantisbt_2 {}; + nextcloud_20 = callPackage ./nextcloud { nextcloudVersion = 20; }; + nextcloud_21 = callPackage ./nextcloud { nextcloudVersion = 21; }; + nextcloud_22 = callPackage ./nextcloud { nextcloudVersion = 22; }; + nextcloud_23 = callPackage ./nextcloud { nextcloudVersion = 23; }; + phpbb = callPackage ./phpbb {}; + phpldapadmin = callPackage ./phpldapadmin {}; + rompr = callPackage ./rompr {}; + roundcubemail = callPackage ./roundcubemail {}; + spip = callPackage ./spip {}; + ttrss = callPackage ./ttrss { inherit sources; }; + wallabag = callPackage ./wallabag { inherit composerEnv; }; + yourls = callPackage ./yourls {}; +} // (if forFlakes then {} else { + #copanier = (builtins.getFlake "path:${builtins.toString ../../../copanier}").defaultPackage.x86_64-linux; + #diaspora = (builtins.getFlake "path:${builtins.toString ../../../diaspora}").defaultPackage.x86_64-linux; + #etherpad-lite = (builtins.getFlake "path:${builtins.toString ../../../etherpad-lite}").defaultPackage.x86_64-linux; + #grocy = (builtins.getFlake "path:${builtins.toString ../../../grocy}").defaultPackage.x86_64-linux; + #mastodon = (builtins.getFlake "path:${builtins.toString ../../../mastodon}").defaultPackage.x86_64-linux; + #mediagoblin = (builtins.getFlake "path:${builtins.toString ../../../mediagoblin}").defaultPackage.x86_64-linux; + #peertube = (builtins.getFlake "path:${builtins.toString ../../../peertube}").defaultPackage.x86_64-linux; + #surfer = (builtins.getFlake "path:${builtins.toString ../../../surfer}").defaultPackage.x86_64-linux; + #taskwarrior-web = (builtins.getFlake "path:${builtins.toString ../../../taskwarrior-web}").defaultPackage.x86_64-linux; +}) diff --git a/pkgs/webapps/dokuwiki/default.nix b/flakes/mypackages/pkgs/webapps/dokuwiki/default.nix similarity index 79% rename from pkgs/webapps/dokuwiki/default.nix rename to flakes/mypackages/pkgs/webapps/dokuwiki/default.nix index 874f0d8..db8be30 100644 --- a/pkgs/webapps/dokuwiki/default.nix +++ b/flakes/mypackages/pkgs/webapps/dokuwiki/default.nix @@ -1,4 +1,4 @@ -{ varDir ? "/var/lib/dokuwiki", preload ? "", lib, callPackage, stdenv, mylibs, writeText }: +{ varDir ? "/var/lib/dokuwiki", preload ? "", lib, callPackage, stdenv, fetchFromGitHub, writeText }: let preloadFile = plugins: let preloads = [preload] ++ builtins.concatMap (p: lib.optional (lib.hasAttr "preload" p) (p.preload p)) plugins; @@ -26,7 +26,16 @@ let passthru = toPassthru newDokuwiki (pkg.plugins ++ plugins); }); in newDokuwiki; - package = stdenv.mkDerivation (mylibs.fetchedGithub ./dokuwiki.json // rec { + package = stdenv.mkDerivation (rec { + pname = "dokuwiki"; + version = "release_stable_2018-04-22b"; + src = fetchFromGitHub { + owner = "splitbrain"; + repo = "dokuwiki"; + rev = "871dae1320b40211626c7ec665f5e6d5290aca95"; + sha256 = "1syvd5dvv3v75swf8ig7dxqs0g5xikb0f6vlcy7g4c4ghldkw7nz"; + fetchSubmodules = true; + }; phases = "unpackPhase buildPhase installPhase installPreloadPhase fixupPhase"; buildPhase = '' mv conf conf.dist diff --git a/pkgs/webapps/dokuwiki/plugins/farmer.nix b/flakes/mypackages/pkgs/webapps/dokuwiki/plugins/farmer.nix similarity index 100% rename from pkgs/webapps/dokuwiki/plugins/farmer.nix rename to flakes/mypackages/pkgs/webapps/dokuwiki/plugins/farmer.nix diff --git a/pkgs/webapps/dokuwiki/plugins/todo.nix b/flakes/mypackages/pkgs/webapps/dokuwiki/plugins/todo.nix similarity index 100% rename from pkgs/webapps/dokuwiki/plugins/todo.nix rename to flakes/mypackages/pkgs/webapps/dokuwiki/plugins/todo.nix diff --git a/pkgs/webapps/infcloud/default.nix b/flakes/mypackages/pkgs/webapps/infcloud/default.nix similarity index 100% rename from pkgs/webapps/infcloud/default.nix rename to flakes/mypackages/pkgs/webapps/infcloud/default.nix diff --git a/pkgs/webapps/infcloud/infcloud_config.js b/flakes/mypackages/pkgs/webapps/infcloud/infcloud_config.js similarity index 100% rename from pkgs/webapps/infcloud/infcloud_config.js rename to flakes/mypackages/pkgs/webapps/infcloud/infcloud_config.js diff --git a/pkgs/webapps/mantisbt_2/bug_report.php.diff b/flakes/mypackages/pkgs/webapps/mantisbt_2/bug_report.php.diff similarity index 100% rename from pkgs/webapps/mantisbt_2/bug_report.php.diff rename to flakes/mypackages/pkgs/webapps/mantisbt_2/bug_report.php.diff diff --git a/pkgs/webapps/mantisbt_2/bug_report_page.php.diff b/flakes/mypackages/pkgs/webapps/mantisbt_2/bug_report_page.php.diff similarity index 100% rename from pkgs/webapps/mantisbt_2/bug_report_page.php.diff rename to flakes/mypackages/pkgs/webapps/mantisbt_2/bug_report_page.php.diff diff --git a/pkgs/webapps/mantisbt_2/bugnote_add.php.diff b/flakes/mypackages/pkgs/webapps/mantisbt_2/bugnote_add.php.diff similarity index 100% rename from pkgs/webapps/mantisbt_2/bugnote_add.php.diff rename to flakes/mypackages/pkgs/webapps/mantisbt_2/bugnote_add.php.diff diff --git a/pkgs/webapps/mantisbt_2/bugnote_add_inc.php.diff b/flakes/mypackages/pkgs/webapps/mantisbt_2/bugnote_add_inc.php.diff similarity index 100% rename from pkgs/webapps/mantisbt_2/bugnote_add_inc.php.diff rename to flakes/mypackages/pkgs/webapps/mantisbt_2/bugnote_add_inc.php.diff diff --git a/pkgs/webapps/mantisbt_2/default.nix b/flakes/mypackages/pkgs/webapps/mantisbt_2/default.nix similarity index 100% rename from pkgs/webapps/mantisbt_2/default.nix rename to flakes/mypackages/pkgs/webapps/mantisbt_2/default.nix diff --git a/pkgs/webapps/mantisbt_2/plugins/slack/default.nix b/flakes/mypackages/pkgs/webapps/mantisbt_2/plugins/slack/default.nix similarity index 100% rename from pkgs/webapps/mantisbt_2/plugins/slack/default.nix rename to flakes/mypackages/pkgs/webapps/mantisbt_2/plugins/slack/default.nix diff --git a/pkgs/webapps/mantisbt_2/plugins/source-integration/Source.API.php.diff b/flakes/mypackages/pkgs/webapps/mantisbt_2/plugins/source-integration/Source.API.php.diff similarity index 100% rename from pkgs/webapps/mantisbt_2/plugins/source-integration/Source.API.php.diff rename to flakes/mypackages/pkgs/webapps/mantisbt_2/plugins/source-integration/Source.API.php.diff diff --git a/pkgs/webapps/mantisbt_2/plugins/source-integration/default.nix b/flakes/mypackages/pkgs/webapps/mantisbt_2/plugins/source-integration/default.nix similarity index 100% rename from pkgs/webapps/mantisbt_2/plugins/source-integration/default.nix rename to flakes/mypackages/pkgs/webapps/mantisbt_2/plugins/source-integration/default.nix diff --git a/pkgs/webapps/nextcloud/apps/apporder.nix b/flakes/mypackages/pkgs/webapps/nextcloud/apps/apporder.nix similarity index 100% rename from pkgs/webapps/nextcloud/apps/apporder.nix rename to flakes/mypackages/pkgs/webapps/nextcloud/apps/apporder.nix diff --git a/pkgs/webapps/nextcloud/apps/audioplayer.nix b/flakes/mypackages/pkgs/webapps/nextcloud/apps/audioplayer.nix similarity index 100% rename from pkgs/webapps/nextcloud/apps/audioplayer.nix rename to flakes/mypackages/pkgs/webapps/nextcloud/apps/audioplayer.nix diff --git a/pkgs/webapps/nextcloud/apps/bookmarks.nix b/flakes/mypackages/pkgs/webapps/nextcloud/apps/bookmarks.nix similarity index 100% rename from pkgs/webapps/nextcloud/apps/bookmarks.nix rename to flakes/mypackages/pkgs/webapps/nextcloud/apps/bookmarks.nix diff --git a/pkgs/webapps/nextcloud/apps/calendar.nix b/flakes/mypackages/pkgs/webapps/nextcloud/apps/calendar.nix similarity index 100% rename from pkgs/webapps/nextcloud/apps/calendar.nix rename to flakes/mypackages/pkgs/webapps/nextcloud/apps/calendar.nix diff --git a/pkgs/webapps/nextcloud/apps/carnet.nix b/flakes/mypackages/pkgs/webapps/nextcloud/apps/carnet.nix similarity index 100% rename from pkgs/webapps/nextcloud/apps/carnet.nix rename to flakes/mypackages/pkgs/webapps/nextcloud/apps/carnet.nix diff --git a/pkgs/webapps/nextcloud/apps/circles.nix b/flakes/mypackages/pkgs/webapps/nextcloud/apps/circles.nix similarity index 100% rename from pkgs/webapps/nextcloud/apps/circles.nix rename to flakes/mypackages/pkgs/webapps/nextcloud/apps/circles.nix diff --git a/pkgs/webapps/nextcloud/apps/contacts.nix b/flakes/mypackages/pkgs/webapps/nextcloud/apps/contacts.nix similarity index 100% rename from pkgs/webapps/nextcloud/apps/contacts.nix rename to flakes/mypackages/pkgs/webapps/nextcloud/apps/contacts.nix diff --git a/pkgs/webapps/nextcloud/apps/cookbook.nix b/flakes/mypackages/pkgs/webapps/nextcloud/apps/cookbook.nix similarity index 100% rename from pkgs/webapps/nextcloud/apps/cookbook.nix rename to flakes/mypackages/pkgs/webapps/nextcloud/apps/cookbook.nix diff --git a/pkgs/webapps/nextcloud/apps/deck.nix b/flakes/mypackages/pkgs/webapps/nextcloud/apps/deck.nix similarity index 100% rename from pkgs/webapps/nextcloud/apps/deck.nix rename to flakes/mypackages/pkgs/webapps/nextcloud/apps/deck.nix diff --git a/pkgs/webapps/nextcloud/apps/drawio.nix b/flakes/mypackages/pkgs/webapps/nextcloud/apps/drawio.nix similarity index 100% rename from pkgs/webapps/nextcloud/apps/drawio.nix rename to flakes/mypackages/pkgs/webapps/nextcloud/apps/drawio.nix diff --git a/pkgs/webapps/nextcloud/apps/external.nix b/flakes/mypackages/pkgs/webapps/nextcloud/apps/external.nix similarity index 100% rename from pkgs/webapps/nextcloud/apps/external.nix rename to flakes/mypackages/pkgs/webapps/nextcloud/apps/external.nix diff --git a/pkgs/webapps/nextcloud/apps/extract.nix b/flakes/mypackages/pkgs/webapps/nextcloud/apps/extract.nix similarity index 100% rename from pkgs/webapps/nextcloud/apps/extract.nix rename to flakes/mypackages/pkgs/webapps/nextcloud/apps/extract.nix diff --git a/pkgs/webapps/nextcloud/apps/files_markdown.nix b/flakes/mypackages/pkgs/webapps/nextcloud/apps/files_markdown.nix similarity index 100% rename from pkgs/webapps/nextcloud/apps/files_markdown.nix rename to flakes/mypackages/pkgs/webapps/nextcloud/apps/files_markdown.nix diff --git a/pkgs/webapps/nextcloud/apps/files_mindmap.nix b/flakes/mypackages/pkgs/webapps/nextcloud/apps/files_mindmap.nix similarity index 100% rename from pkgs/webapps/nextcloud/apps/files_mindmap.nix rename to flakes/mypackages/pkgs/webapps/nextcloud/apps/files_mindmap.nix diff --git a/pkgs/webapps/nextcloud/apps/files_readmemd.nix b/flakes/mypackages/pkgs/webapps/nextcloud/apps/files_readmemd.nix similarity index 100% rename from pkgs/webapps/nextcloud/apps/files_readmemd.nix rename to flakes/mypackages/pkgs/webapps/nextcloud/apps/files_readmemd.nix diff --git a/pkgs/webapps/nextcloud/apps/flowupload.nix b/flakes/mypackages/pkgs/webapps/nextcloud/apps/flowupload.nix similarity index 100% rename from pkgs/webapps/nextcloud/apps/flowupload.nix rename to flakes/mypackages/pkgs/webapps/nextcloud/apps/flowupload.nix diff --git a/pkgs/webapps/nextcloud/apps/gpxedit.nix b/flakes/mypackages/pkgs/webapps/nextcloud/apps/gpxedit.nix similarity index 100% rename from pkgs/webapps/nextcloud/apps/gpxedit.nix rename to flakes/mypackages/pkgs/webapps/nextcloud/apps/gpxedit.nix diff --git a/pkgs/webapps/nextcloud/apps/gpxpod.nix b/flakes/mypackages/pkgs/webapps/nextcloud/apps/gpxpod.nix similarity index 100% rename from pkgs/webapps/nextcloud/apps/gpxpod.nix rename to flakes/mypackages/pkgs/webapps/nextcloud/apps/gpxpod.nix diff --git a/pkgs/webapps/nextcloud/apps/groupfolders.nix b/flakes/mypackages/pkgs/webapps/nextcloud/apps/groupfolders.nix similarity index 100% rename from pkgs/webapps/nextcloud/apps/groupfolders.nix rename to flakes/mypackages/pkgs/webapps/nextcloud/apps/groupfolders.nix diff --git a/pkgs/webapps/nextcloud/apps/impersonate.nix b/flakes/mypackages/pkgs/webapps/nextcloud/apps/impersonate.nix similarity index 100% rename from pkgs/webapps/nextcloud/apps/impersonate.nix rename to flakes/mypackages/pkgs/webapps/nextcloud/apps/impersonate.nix diff --git a/pkgs/webapps/nextcloud/apps/keeweb.nix b/flakes/mypackages/pkgs/webapps/nextcloud/apps/keeweb.nix similarity index 100% rename from pkgs/webapps/nextcloud/apps/keeweb.nix rename to flakes/mypackages/pkgs/webapps/nextcloud/apps/keeweb.nix diff --git a/pkgs/webapps/nextcloud/apps/maps.nix b/flakes/mypackages/pkgs/webapps/nextcloud/apps/maps.nix similarity index 100% rename from pkgs/webapps/nextcloud/apps/maps.nix rename to flakes/mypackages/pkgs/webapps/nextcloud/apps/maps.nix diff --git a/pkgs/webapps/nextcloud/apps/metadata.nix b/flakes/mypackages/pkgs/webapps/nextcloud/apps/metadata.nix similarity index 100% rename from pkgs/webapps/nextcloud/apps/metadata.nix rename to flakes/mypackages/pkgs/webapps/nextcloud/apps/metadata.nix diff --git a/pkgs/webapps/nextcloud/apps/music.nix b/flakes/mypackages/pkgs/webapps/nextcloud/apps/music.nix similarity index 100% rename from pkgs/webapps/nextcloud/apps/music.nix rename to flakes/mypackages/pkgs/webapps/nextcloud/apps/music.nix diff --git a/pkgs/webapps/nextcloud/apps/notes.nix b/flakes/mypackages/pkgs/webapps/nextcloud/apps/notes.nix similarity index 100% rename from pkgs/webapps/nextcloud/apps/notes.nix rename to flakes/mypackages/pkgs/webapps/nextcloud/apps/notes.nix diff --git a/pkgs/webapps/nextcloud/apps/ocsms.nix b/flakes/mypackages/pkgs/webapps/nextcloud/apps/ocsms.nix similarity index 100% rename from pkgs/webapps/nextcloud/apps/ocsms.nix rename to flakes/mypackages/pkgs/webapps/nextcloud/apps/ocsms.nix diff --git a/pkgs/webapps/nextcloud/apps/onlyoffice.nix b/flakes/mypackages/pkgs/webapps/nextcloud/apps/onlyoffice.nix similarity index 100% rename from pkgs/webapps/nextcloud/apps/onlyoffice.nix rename to flakes/mypackages/pkgs/webapps/nextcloud/apps/onlyoffice.nix diff --git a/pkgs/webapps/nextcloud/apps/passman.nix b/flakes/mypackages/pkgs/webapps/nextcloud/apps/passman.nix similarity index 100% rename from pkgs/webapps/nextcloud/apps/passman.nix rename to flakes/mypackages/pkgs/webapps/nextcloud/apps/passman.nix diff --git a/pkgs/webapps/nextcloud/apps/polls.nix b/flakes/mypackages/pkgs/webapps/nextcloud/apps/polls.nix similarity index 100% rename from pkgs/webapps/nextcloud/apps/polls.nix rename to flakes/mypackages/pkgs/webapps/nextcloud/apps/polls.nix diff --git a/pkgs/webapps/nextcloud/apps/social.nix b/flakes/mypackages/pkgs/webapps/nextcloud/apps/social.nix similarity index 100% rename from pkgs/webapps/nextcloud/apps/social.nix rename to flakes/mypackages/pkgs/webapps/nextcloud/apps/social.nix diff --git a/pkgs/webapps/nextcloud/apps/spreed.nix b/flakes/mypackages/pkgs/webapps/nextcloud/apps/spreed.nix similarity index 100% rename from pkgs/webapps/nextcloud/apps/spreed.nix rename to flakes/mypackages/pkgs/webapps/nextcloud/apps/spreed.nix diff --git a/pkgs/webapps/nextcloud/apps/talk_matterbridge.nix b/flakes/mypackages/pkgs/webapps/nextcloud/apps/talk_matterbridge.nix similarity index 100% rename from pkgs/webapps/nextcloud/apps/talk_matterbridge.nix rename to flakes/mypackages/pkgs/webapps/nextcloud/apps/talk_matterbridge.nix diff --git a/pkgs/webapps/nextcloud/apps/tasks.nix b/flakes/mypackages/pkgs/webapps/nextcloud/apps/tasks.nix similarity index 100% rename from pkgs/webapps/nextcloud/apps/tasks.nix rename to flakes/mypackages/pkgs/webapps/nextcloud/apps/tasks.nix diff --git a/pkgs/webapps/nextcloud/default.nix b/flakes/mypackages/pkgs/webapps/nextcloud/default.nix similarity index 100% rename from pkgs/webapps/nextcloud/default.nix rename to flakes/mypackages/pkgs/webapps/nextcloud/default.nix diff --git a/pkgs/webapps/phpbb/default.nix b/flakes/mypackages/pkgs/webapps/phpbb/default.nix similarity index 100% rename from pkgs/webapps/phpbb/default.nix rename to flakes/mypackages/pkgs/webapps/phpbb/default.nix diff --git a/pkgs/webapps/phpbb/extensions/adduser.nix b/flakes/mypackages/pkgs/webapps/phpbb/extensions/adduser.nix similarity index 100% rename from pkgs/webapps/phpbb/extensions/adduser.nix rename to flakes/mypackages/pkgs/webapps/phpbb/extensions/adduser.nix diff --git a/pkgs/webapps/phpbb/extensions/autosubscribe.nix b/flakes/mypackages/pkgs/webapps/phpbb/extensions/autosubscribe.nix similarity index 100% rename from pkgs/webapps/phpbb/extensions/autosubscribe.nix rename to flakes/mypackages/pkgs/webapps/phpbb/extensions/autosubscribe.nix diff --git a/pkgs/webapps/phpbb/extensions/mailinglist.nix b/flakes/mypackages/pkgs/webapps/phpbb/extensions/mailinglist.nix similarity index 100% rename from pkgs/webapps/phpbb/extensions/mailinglist.nix rename to flakes/mypackages/pkgs/webapps/phpbb/extensions/mailinglist.nix diff --git a/pkgs/webapps/phpbb/extensions/markdown.nix b/flakes/mypackages/pkgs/webapps/phpbb/extensions/markdown.nix similarity index 100% rename from pkgs/webapps/phpbb/extensions/markdown.nix rename to flakes/mypackages/pkgs/webapps/phpbb/extensions/markdown.nix diff --git a/pkgs/webapps/phpbb/extensions/mchat.nix b/flakes/mypackages/pkgs/webapps/phpbb/extensions/mchat.nix similarity index 100% rename from pkgs/webapps/phpbb/extensions/mchat.nix rename to flakes/mypackages/pkgs/webapps/phpbb/extensions/mchat.nix diff --git a/pkgs/webapps/phpbb/extensions/monitoranswers.nix b/flakes/mypackages/pkgs/webapps/phpbb/extensions/monitoranswers.nix similarity index 100% rename from pkgs/webapps/phpbb/extensions/monitoranswers.nix rename to flakes/mypackages/pkgs/webapps/phpbb/extensions/monitoranswers.nix diff --git a/pkgs/webapps/phpbb/langs/fr.nix b/flakes/mypackages/pkgs/webapps/phpbb/langs/fr.nix similarity index 100% rename from pkgs/webapps/phpbb/langs/fr.nix rename to flakes/mypackages/pkgs/webapps/phpbb/langs/fr.nix diff --git a/pkgs/webapps/phpldapadmin/default.nix b/flakes/mypackages/pkgs/webapps/phpldapadmin/default.nix similarity index 100% rename from pkgs/webapps/phpldapadmin/default.nix rename to flakes/mypackages/pkgs/webapps/phpldapadmin/default.nix diff --git a/pkgs/webapps/phpldapadmin/ldap-align-button.patch b/flakes/mypackages/pkgs/webapps/phpldapadmin/ldap-align-button.patch similarity index 100% rename from pkgs/webapps/phpldapadmin/ldap-align-button.patch rename to flakes/mypackages/pkgs/webapps/phpldapadmin/ldap-align-button.patch diff --git a/pkgs/webapps/phpldapadmin/ldap-fix-password.patch b/flakes/mypackages/pkgs/webapps/phpldapadmin/ldap-fix-password.patch similarity index 100% rename from pkgs/webapps/phpldapadmin/ldap-fix-password.patch rename to flakes/mypackages/pkgs/webapps/phpldapadmin/ldap-fix-password.patch diff --git a/pkgs/webapps/phpldapadmin/ldap-sort-in-templates.patch b/flakes/mypackages/pkgs/webapps/phpldapadmin/ldap-sort-in-templates.patch similarity index 100% rename from pkgs/webapps/phpldapadmin/ldap-sort-in-templates.patch rename to flakes/mypackages/pkgs/webapps/phpldapadmin/ldap-sort-in-templates.patch diff --git a/flakes/mypackages/pkgs/webapps/rompr/default.nix b/flakes/mypackages/pkgs/webapps/rompr/default.nix new file mode 100644 index 0000000..5b3e7e0 --- /dev/null +++ b/flakes/mypackages/pkgs/webapps/rompr/default.nix @@ -0,0 +1,17 @@ +{ varDir ? "/var/lib/rompr", stdenv, fetchFromGitHub }: +stdenv.mkDerivation ({ + pname = "rompr"; + version = "1.24"; + src = fetchFromGitHub { + owner = "fatg3erman"; + repo = "RompR"; + rev = "0d8f597027ac71b320963fe3f33f461a136312ad"; + sha256 = "13p3c4whhmvz1vvh9fva5gdx4xji288k108hjdi8b1yn506lzix2"; + fetchSubmodules = true; + }; + installPhase = '' + cp -a . $out + ln -sf ${varDir}/prefs $out/prefs + ln -sf ${varDir}/albumart $out/albumart + ''; +}) diff --git a/pkgs/webapps/roundcubemail/add_all.patch b/flakes/mypackages/pkgs/webapps/roundcubemail/add_all.patch similarity index 100% rename from pkgs/webapps/roundcubemail/add_all.patch rename to flakes/mypackages/pkgs/webapps/roundcubemail/add_all.patch diff --git a/pkgs/webapps/roundcubemail/default.nix b/flakes/mypackages/pkgs/webapps/roundcubemail/default.nix similarity index 100% rename from pkgs/webapps/roundcubemail/default.nix rename to flakes/mypackages/pkgs/webapps/roundcubemail/default.nix diff --git a/pkgs/webapps/roundcubemail/plugins/automatic_addressbook/default.nix b/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/automatic_addressbook/default.nix similarity index 100% rename from pkgs/webapps/roundcubemail/plugins/automatic_addressbook/default.nix rename to flakes/mypackages/pkgs/webapps/roundcubemail/plugins/automatic_addressbook/default.nix diff --git a/pkgs/webapps/roundcubemail/plugins/carddav/default.nix b/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/carddav/default.nix similarity index 100% rename from pkgs/webapps/roundcubemail/plugins/carddav/default.nix rename to flakes/mypackages/pkgs/webapps/roundcubemail/plugins/carddav/default.nix diff --git a/pkgs/webapps/roundcubemail/plugins/contextmenu/default.nix b/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/contextmenu/default.nix similarity index 100% rename from pkgs/webapps/roundcubemail/plugins/contextmenu/default.nix rename to flakes/mypackages/pkgs/webapps/roundcubemail/plugins/contextmenu/default.nix diff --git a/pkgs/webapps/roundcubemail/plugins/contextmenu_folder/default.nix b/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/contextmenu_folder/default.nix similarity index 100% rename from pkgs/webapps/roundcubemail/plugins/contextmenu_folder/default.nix rename to flakes/mypackages/pkgs/webapps/roundcubemail/plugins/contextmenu_folder/default.nix diff --git a/pkgs/webapps/roundcubemail/plugins/html5_notifier/default.nix b/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/html5_notifier/default.nix similarity index 100% rename from pkgs/webapps/roundcubemail/plugins/html5_notifier/default.nix rename to flakes/mypackages/pkgs/webapps/roundcubemail/plugins/html5_notifier/default.nix diff --git a/pkgs/webapps/roundcubemail/plugins/ident_switch/default.nix b/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/ident_switch/default.nix similarity index 100% rename from pkgs/webapps/roundcubemail/plugins/ident_switch/default.nix rename to flakes/mypackages/pkgs/webapps/roundcubemail/plugins/ident_switch/default.nix diff --git a/pkgs/webapps/roundcubemail/plugins/message_highlight/default.nix b/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/message_highlight/default.nix similarity index 100% rename from pkgs/webapps/roundcubemail/plugins/message_highlight/default.nix rename to flakes/mypackages/pkgs/webapps/roundcubemail/plugins/message_highlight/default.nix diff --git a/pkgs/webapps/roundcubemail/plugins/thunderbird_labels/default.nix b/flakes/mypackages/pkgs/webapps/roundcubemail/plugins/thunderbird_labels/default.nix similarity index 100% rename from pkgs/webapps/roundcubemail/plugins/thunderbird_labels/default.nix rename to flakes/mypackages/pkgs/webapps/roundcubemail/plugins/thunderbird_labels/default.nix diff --git a/pkgs/webapps/spip/default.nix b/flakes/mypackages/pkgs/webapps/spip/default.nix similarity index 100% rename from pkgs/webapps/spip/default.nix rename to flakes/mypackages/pkgs/webapps/spip/default.nix diff --git a/pkgs/webapps/spip/spip_ldap_patch.patch b/flakes/mypackages/pkgs/webapps/spip/spip_ldap_patch.patch similarity index 100% rename from pkgs/webapps/spip/spip_ldap_patch.patch rename to flakes/mypackages/pkgs/webapps/spip/spip_ldap_patch.patch diff --git a/pkgs/webapps/spip/spip_mes_options.php b/flakes/mypackages/pkgs/webapps/spip/spip_mes_options.php similarity index 100% rename from pkgs/webapps/spip/spip_mes_options.php rename to flakes/mypackages/pkgs/webapps/spip/spip_mes_options.php diff --git a/pkgs/webapps/ttrss/default.nix b/flakes/mypackages/pkgs/webapps/ttrss/default.nix similarity index 100% rename from pkgs/webapps/ttrss/default.nix rename to flakes/mypackages/pkgs/webapps/ttrss/default.nix diff --git a/flakes/mypackages/pkgs/webapps/ttrss/plugins/af_feedmod/default.nix b/flakes/mypackages/pkgs/webapps/ttrss/plugins/af_feedmod/default.nix new file mode 100644 index 0000000..39f9e0e --- /dev/null +++ b/flakes/mypackages/pkgs/webapps/ttrss/plugins/af_feedmod/default.nix @@ -0,0 +1,18 @@ +{ patched ? false, stdenv, fetchFromGitHub, lib }: +stdenv.mkDerivation ({ + pname = "ttrss-af_feedmod"; + version = "0ea2092-master"; + src = fetchFromGitHub { + owner = "mbirth"; + repo = "ttrss_plugin-af_feedmod"; + rev = "0ea2092dd34067ecd898802cfca3570023d1ecfe"; + sha256 = "02ibf47zcrsc2rr45wsix8gxyyf371davj8n8i0gj1zdq95klvnv"; + fetchSubmodules = true; + }; + patches = lib.optionals patched [ ./type_replace.patch ]; + installPhase = '' + mkdir $out + cp init.php $out + ''; + passthru.pluginName = "af_feedmod"; +}) diff --git a/pkgs/webapps/ttrss/plugins/af_feedmod/type_replace.patch b/flakes/mypackages/pkgs/webapps/ttrss/plugins/af_feedmod/type_replace.patch similarity index 100% rename from pkgs/webapps/ttrss/plugins/af_feedmod/type_replace.patch rename to flakes/mypackages/pkgs/webapps/ttrss/plugins/af_feedmod/type_replace.patch diff --git a/flakes/mypackages/pkgs/webapps/ttrss/plugins/auth_ldap/default.nix b/flakes/mypackages/pkgs/webapps/ttrss/plugins/auth_ldap/default.nix new file mode 100644 index 0000000..d283160 --- /dev/null +++ b/flakes/mypackages/pkgs/webapps/ttrss/plugins/auth_ldap/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchFromGitHub }: +stdenv.mkDerivation ({ + pname = "ttrss-auth-ldap"; + version = "4d751b0-master"; + src = fetchFromGitHub { + owner = "hydrian"; + repo = "TTRSS-Auth-LDAP"; + rev = "4d751b095c29a8dbe2dc7bb07777742956136e94"; + sha256 = "0b9fl86acrzpcv41r7pj3bl8b3n72hpkdywzx9zjyfqv5pskxyim"; + fetchSubmodules = true; + }; + installPhase = '' + mkdir $out + cp plugins/auth_ldap/init.php $out + ''; + passthru.pluginName = "auth_ldap"; +}) diff --git a/flakes/mypackages/pkgs/webapps/ttrss/plugins/feediron/default.nix b/flakes/mypackages/pkgs/webapps/ttrss/plugins/feediron/default.nix new file mode 100644 index 0000000..2f86416 --- /dev/null +++ b/flakes/mypackages/pkgs/webapps/ttrss/plugins/feediron/default.nix @@ -0,0 +1,18 @@ +{ patched ? false, stdenv, fetchFromGitHub, lib }: +stdenv.mkDerivation ({ + pname = "ttrss-feediron"; + version = "407168c-master"; + src = fetchFromGitHub { + owner = "m42e"; + repo = "ttrss_plugin-feediron"; + rev = "407168c628880b5ced572cc549db6d50e866d3c8"; + sha256 = "17b95ifpcph6m03hjd1mhi8gi1hw9yd3fnffmw66fqr5c9l3zd9r"; + fetchSubmodules = true; + }; + patches = lib.optionals patched [ ./json_reformat.patch ]; + installPhase = '' + mkdir $out + cp -a . $out + ''; + passthru.pluginName = "feediron"; +}) diff --git a/pkgs/webapps/ttrss/plugins/feediron/json_reformat.patch b/flakes/mypackages/pkgs/webapps/ttrss/plugins/feediron/json_reformat.patch similarity index 100% rename from pkgs/webapps/ttrss/plugins/feediron/json_reformat.patch rename to flakes/mypackages/pkgs/webapps/ttrss/plugins/feediron/json_reformat.patch diff --git a/flakes/mypackages/pkgs/webapps/ttrss/plugins/ff_instagram/default.nix b/flakes/mypackages/pkgs/webapps/ttrss/plugins/ff_instagram/default.nix new file mode 100644 index 0000000..f0df588 --- /dev/null +++ b/flakes/mypackages/pkgs/webapps/ttrss/plugins/ff_instagram/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchFromGitHub }: +stdenv.mkDerivation ({ + pname = "ttrss-ff_instagram"; + version = "0366ffb-master"; + src = fetchFromGitHub { + owner = "wltb"; + repo = "ff_instagram"; + rev = "0366ffb18c4d490c8fbfba2f5f3367a5af23cfe8"; + sha256 = "0vvzl6wi6jmrqknsfddvckjgsgfizz1d923d1nyrpzjfn6bda1vk"; + fetchSubmodules = true; + }; + installPhase = '' + mkdir $out + cp -a . $out + ''; + passthru.pluginName = "ff_instagram"; +}) diff --git a/flakes/mypackages/pkgs/webapps/ttrss/plugins/tumblr_gdpr_ua/default.nix b/flakes/mypackages/pkgs/webapps/ttrss/plugins/tumblr_gdpr_ua/default.nix new file mode 100644 index 0000000..072b6c3 --- /dev/null +++ b/flakes/mypackages/pkgs/webapps/ttrss/plugins/tumblr_gdpr_ua/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchFromGitHub }: +stdenv.mkDerivation ({ + pname = "ttrss-tumblr_gdpr_ua"; + version = "287c584-master"; + src = fetchFromGitHub { + owner = "hkockerbeck"; + repo = "ttrss-tumblr-gdpr-ua"; + rev = "287c584e68845d524f920156bff0b2eaa6f65117"; + sha256 = "1fviawgcclqky4k4xv1sqzvpb8i74w9f0pclm09m78s8l85wh9py"; + fetchSubmodules = true; + }; + installPhase = '' + mkdir $out + cp -a . $out + ''; + passthru.pluginName = "tumblr_gdpr_ua"; +}) diff --git a/pkgs/webapps/wallabag/default.nix b/flakes/mypackages/pkgs/webapps/wallabag/default.nix similarity index 100% rename from pkgs/webapps/wallabag/default.nix rename to flakes/mypackages/pkgs/webapps/wallabag/default.nix diff --git a/pkgs/webapps/wallabag/ldap.patch b/flakes/mypackages/pkgs/webapps/wallabag/ldap.patch similarity index 100% rename from pkgs/webapps/wallabag/ldap.patch rename to flakes/mypackages/pkgs/webapps/wallabag/ldap.patch diff --git a/pkgs/webapps/yourls/default.nix b/flakes/mypackages/pkgs/webapps/yourls/default.nix similarity index 63% rename from pkgs/webapps/yourls/default.nix rename to flakes/mypackages/pkgs/webapps/yourls/default.nix index d940c54..8001a60 100644 --- a/pkgs/webapps/yourls/default.nix +++ b/flakes/mypackages/pkgs/webapps/yourls/default.nix @@ -1,8 +1,8 @@ -{ yourls_config ? "/etc/yourls/config.php", mylibs, callPackage, lib, stdenv }: +{ yourls_config ? "/etc/yourls/config.php", fetchFromGitHub, callPackage, lib, stdenv }: let pluginNames = [ "ldap" ]; allPlugins = lib.attrsets.genAttrs pluginNames - (name: callPackage (./plugins + "/${name}") { inherit mylibs; }); + (name: callPackage (./plugins + "/${name}") {}); toPassthru = pkg: plugins: { inherit plugins allPlugins; withPlugins = withPlugins pkg; @@ -16,7 +16,16 @@ let passthru = toPassthru newYourls (pkg.plugins ++ plugins); }); in newYourls; - package = stdenv.mkDerivation (mylibs.fetchedGithub ./yourls.json // rec { + package = stdenv.mkDerivation (rec { + pname = "yourls"; + version = "1.7.3"; + src = fetchFromGitHub { + owner = "YOURLS"; + repo = "YOURLS"; + rev = "077018822d3594229daa8343310d0b40804b9ddc"; + sha256 = "1av6h619rwqn0yn0kjn2s2h3gmrhmxaaa9hd5ns4ralxgg731imd"; + fetchSubmodules = true; + }; installPhase = '' mkdir -p $out cp -a */ *.php $out/ diff --git a/flakes/mypackages/pkgs/webapps/yourls/plugins/ldap/default.nix b/flakes/mypackages/pkgs/webapps/yourls/plugins/ldap/default.nix new file mode 100644 index 0000000..5870faa --- /dev/null +++ b/flakes/mypackages/pkgs/webapps/yourls/plugins/ldap/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchFromGitHub }: +stdenv.mkDerivation (rec { + pname = "yourls-ldap-plugin"; + version = "2a3cb03-master"; + src = fetchFromGitHub { + owner = "k3a"; + repo = "yourls-ldap-plugin"; + rev = "2a3cb0334b8a6b81b284a7196e614bbd2b2b1615"; + sha256 = "0cchbnli77d295lzf7kjmn4dcxj2bmdqa9qc3f8l8qgmp4n5n0gh"; + fetchSubmodules = true; + }; + installPhase = '' + mkdir -p $out + cp plugin.php $out + ''; + passthru.pluginName = "ldap"; +}) diff --git a/nix/README.md b/flakes/mypackages/sources/README.md similarity index 100% rename from nix/README.md rename to flakes/mypackages/sources/README.md diff --git a/nix/sources.json b/flakes/mypackages/sources/sources.json similarity index 97% rename from nix/sources.json rename to flakes/mypackages/sources/sources.json index d25f195..387cb67 100644 --- a/nix/sources.json +++ b/flakes/mypackages/sources/sources.json @@ -64,9 +64,10 @@ "version": "2f2ec6b-master" }, "websites-richie-app": { + "branch": "master", "ref": "master", "repo": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Richie", - "rev": "2a09e29dd9fc4f6abc5add82744bedf1978a35d5", + "rev": "1ea1d384ec748c24b02bdcd6314ec2148806fd58", "type": "git", "version": "2a09e29-master" } diff --git a/nix/sources.nix b/flakes/mypackages/sources/sources.nix similarity index 100% rename from nix/sources.nix rename to flakes/mypackages/sources/sources.nix diff --git a/modules/private/buildbot/common/build_helpers.py b/flakes/private/buildbot/common/build_helpers.py similarity index 100% rename from modules/private/buildbot/common/build_helpers.py rename to flakes/private/buildbot/common/build_helpers.py diff --git a/modules/private/buildbot/common/libvirt.py b/flakes/private/buildbot/common/libvirt.py similarity index 100% rename from modules/private/buildbot/common/libvirt.py rename to flakes/private/buildbot/common/libvirt.py diff --git a/modules/private/buildbot/common/master.cfg b/flakes/private/buildbot/common/master.cfg similarity index 100% rename from modules/private/buildbot/common/master.cfg rename to flakes/private/buildbot/common/master.cfg diff --git a/flakes/private/buildbot/flake.nix b/flakes/private/buildbot/flake.nix index 1cbd0ea..5371656 100644 --- a/flakes/private/buildbot/flake.nix +++ b/flakes/private/buildbot/flake.nix @@ -26,7 +26,7 @@ }; buildbot_common = python.pkgs.buildPythonPackage { name = "buildbot_common"; - src = ../../../modules/private/buildbot/common; + src = ./common; format = "other"; installPhase = '' mkdir -p $out/${python.sitePackages} @@ -37,7 +37,7 @@ inherit buildbot_common; buildbot_config = project: python.pkgs.buildPythonPackage (rec { name = "buildbot_config-${project.name}"; - src = ../../../modules/private/buildbot/projects + "/${project.name}"; + src = ./projects + "/${project.name}"; format = "other"; installPhase = '' mkdir -p $out/${python.sitePackages} diff --git a/modules/private/buildbot/projects/caldance/__init__.py b/flakes/private/buildbot/projects/caldance/__init__.py similarity index 100% rename from modules/private/buildbot/projects/caldance/__init__.py rename to flakes/private/buildbot/projects/caldance/__init__.py diff --git a/modules/private/buildbot/projects/cryptoportfolio/__init__.py b/flakes/private/buildbot/projects/cryptoportfolio/__init__.py similarity index 100% rename from modules/private/buildbot/projects/cryptoportfolio/__init__.py rename to flakes/private/buildbot/projects/cryptoportfolio/__init__.py diff --git a/modules/private/buildbot/projects/denise/__init__.py b/flakes/private/buildbot/projects/denise/__init__.py similarity index 100% rename from modules/private/buildbot/projects/denise/__init__.py rename to flakes/private/buildbot/projects/denise/__init__.py diff --git a/modules/private/buildbot/projects/immaeEu/__init__.py b/flakes/private/buildbot/projects/immaeEu/__init__.py similarity index 100% rename from modules/private/buildbot/projects/immaeEu/__init__.py rename to flakes/private/buildbot/projects/immaeEu/__init__.py diff --git a/modules/private/buildbot/projects/immaeEu/scripts/lacells_download b/flakes/private/buildbot/projects/immaeEu/scripts/lacells_download similarity index 100% rename from modules/private/buildbot/projects/immaeEu/scripts/lacells_download rename to flakes/private/buildbot/projects/immaeEu/scripts/lacells_download diff --git a/modules/private/buildbot/projects/nicecoop/__init__.py b/flakes/private/buildbot/projects/nicecoop/__init__.py similarity index 100% rename from modules/private/buildbot/projects/nicecoop/__init__.py rename to flakes/private/buildbot/projects/nicecoop/__init__.py diff --git a/modules/private/buildbot/projects/test/__init__.py b/flakes/private/buildbot/projects/test/__init__.py similarity index 100% rename from modules/private/buildbot/projects/test/__init__.py rename to flakes/private/buildbot/projects/test/__init__.py diff --git a/flakes/private/openarc/flake.lock b/flakes/private/openarc/flake.lock index 6ca846f..cb7cf3f 100644 --- a/flakes/private/openarc/flake.lock +++ b/flakes/private/openarc/flake.lock @@ -31,7 +31,7 @@ "nixpkgs": "nixpkgs" }, "locked": { - "narHash": "sha256-HGNP1eH7b42BxViYx/F3ZPO9CM1X+5qfA9JoP2ArN+s=", + "narHash": "sha256-mghjuNNCtvAjX8ly9MSmd+juG1a6PlaMhElRWqyxrS8=", "path": "../../lib", "type": "path" }, @@ -59,11 +59,11 @@ }, "nix-lib": { "locked": { - "lastModified": 1633008342, - "narHash": "sha256-wZV5YidnsqV/iufDIhaZip3LzwUGeIt8wtdiGS5+cXc=", + "lastModified": 1675728117, + "narHash": "sha256-Q5JzYrpwEyx9/0He2ROEzUFu2JwLvtnNnS1fUB45WvQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6eae8a116011f4db0aa5146f364820024411d6bb", + "rev": "1bda69b4294492363df8716263aa06ed6637148c", "type": "github" }, "original": { @@ -74,11 +74,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1631570365, - "narHash": "sha256-vc6bfo0hijpicdUDiui2DvZXmpIP2iqOFZRcpMOuYPo=", + "lastModified": 1648725829, + "narHash": "sha256-tXEzI38lLrzW2qCAIs0UAatE2xcsTsoKWaaXqAcF1NI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "df7113c0727881519248d4c7d080324e0ee3327b", + "rev": "72152ff5ad470ed1a5b97c0ba2737938c136c994", "type": "github" }, "original": { diff --git a/flakes/private/opendmarc/flake.lock b/flakes/private/opendmarc/flake.lock index ffb7407..66a9b92 100644 --- a/flakes/private/opendmarc/flake.lock +++ b/flakes/private/opendmarc/flake.lock @@ -31,7 +31,7 @@ "nixpkgs": "nixpkgs" }, "locked": { - "narHash": "sha256-HGNP1eH7b42BxViYx/F3ZPO9CM1X+5qfA9JoP2ArN+s=", + "narHash": "sha256-GAe7hK2n9U6hxiQt/IHq++fhFCxKJzgwQJK5/ZM4hSQ=", "path": "../../lib", "type": "path" }, @@ -59,11 +59,11 @@ }, "nix-lib": { "locked": { - "lastModified": 1633008342, - "narHash": "sha256-wZV5YidnsqV/iufDIhaZip3LzwUGeIt8wtdiGS5+cXc=", + "lastModified": 1675728384, + "narHash": "sha256-OtuaHcx9+KQGo64MUpDXjLf9dkHA0VzvBTl8KLZVawY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6eae8a116011f4db0aa5146f364820024411d6bb", + "rev": "98a5726addacbf959005940172127ee5ae91c71f", "type": "github" }, "original": { @@ -74,11 +74,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1631570365, - "narHash": "sha256-vc6bfo0hijpicdUDiui2DvZXmpIP2iqOFZRcpMOuYPo=", + "lastModified": 1648725829, + "narHash": "sha256-tXEzI38lLrzW2qCAIs0UAatE2xcsTsoKWaaXqAcF1NI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "df7113c0727881519248d4c7d080324e0ee3327b", + "rev": "72152ff5ad470ed1a5b97c0ba2737938c136c994", "type": "github" }, "original": { diff --git a/flakes/private/paste/flake.lock b/flakes/private/paste/flake.lock index 6ad428c..7691cce 100644 --- a/flakes/private/paste/flake.lock +++ b/flakes/private/paste/flake.lock @@ -80,7 +80,7 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "narHash": "sha256-2ylI42ZHfzW6oCsxfFyHf5zVnDsPMwvJCACtcdErtPg=", + "narHash": "sha256-971ljwzJ+hJj8M+sMnsDWjf7UR261tUMZebh2T6VssM=", "path": "../../paste", "type": "path" }, diff --git a/flakes/private/peertube/flake.lock b/flakes/private/peertube/flake.lock index 4944da7..1663458 100644 --- a/flakes/private/peertube/flake.lock +++ b/flakes/private/peertube/flake.lock @@ -136,12 +136,12 @@ "peertube": "peertube" }, "locked": { - "narHash": "sha256-ESrcCrx7QmNk8MHgws9KrPEZqIxKNQ6bcshbUPj9u88=", - "path": "../../peertube", + "narHash": "sha256-01nut8vbrR8s8G2JnRaxooZdefH1LMbhuJpgcH1e3vY=", + "path": "./../../peertube", "type": "path" }, "original": { - "path": "../../peertube", + "path": "./../../peertube", "type": "path" } }, @@ -153,12 +153,12 @@ "peertube": "peertube_2" }, "locked": { - "narHash": "sha256-ESrcCrx7QmNk8MHgws9KrPEZqIxKNQ6bcshbUPj9u88=", - "path": "../../peertube", + "narHash": "sha256-01nut8vbrR8s8G2JnRaxooZdefH1LMbhuJpgcH1e3vY=", + "path": "./../../peertube", "type": "path" }, "original": { - "path": "../../peertube", + "path": "./../../peertube", "type": "path" } }, diff --git a/flakes/private/peertube/flake.nix b/flakes/private/peertube/flake.nix index 5bbe89c..d7b83d8 100644 --- a/flakes/private/peertube/flake.nix +++ b/flakes/private/peertube/flake.nix @@ -1,10 +1,10 @@ { description = "Patched peertube"; inputs.peertube_origin = { - url = "path:../../peertube"; + url = "path:./../../peertube"; }; inputs.peertube_syden = { - url = "path:../../peertube"; + url = "path:./../../peertube"; inputs.peertube = { url = "https://git.immae.eu/github/Chocobozzz/PeerTube.git"; ref = "gitolite_local/syden"; diff --git a/flakes/surfer/flake.lock b/flakes/surfer/flake.lock index 088b082..a5df00d 100644 --- a/flakes/surfer/flake.lock +++ b/flakes/surfer/flake.lock @@ -1,5 +1,23 @@ { "nodes": { + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1675295133, + "narHash": "sha256-dU8fuLL98WFXG0VnRgM00bqKX6CEPBLybhiIDIgO45o=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "bf53492df08f3178ce85e0c9df8ed8d03c030c9f", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1648297722, @@ -15,7 +33,56 @@ "type": "github" } }, + "mypackages": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs" + }, + "locked": { + "narHash": "sha256-v0CkzgqCXRJkHZCIdDnrwFoHCXM5SwHFV+9msTQKf+I=", + "path": "../mypackages", + "type": "path" + }, + "original": { + "path": "../mypackages", + "type": "path" + } + }, "nixpkgs": { + "locked": { + "lastModified": 1646497237, + "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026", + "type": "github" + } + }, + "nixpkgs-lib": { + "locked": { + "dir": "lib", + "lastModified": 1675183161, + "narHash": "sha256-Zq8sNgAxDckpn7tJo7V1afRSk2eoVbu3OjI1QklGLNg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e1e1b192c1a5aab2960bf0a0bd53a2e8124fa18e", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { "flake": false, "locked": { "lastModified": 1596265691, @@ -35,7 +102,8 @@ "root": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", + "mypackages": "mypackages", + "nixpkgs": "nixpkgs_2", "surfer": "surfer" } }, diff --git a/flakes/surfer/flake.nix b/flakes/surfer/flake.nix index e6a7322..996104c 100644 --- a/flakes/surfer/flake.nix +++ b/flakes/surfer/flake.nix @@ -11,10 +11,11 @@ rev = "476177380452c9c7c5b1624805feedc824c5995e"; flake = false; }; - outputs = { self, nixpkgs, surfer, flake-utils }: flake-utils.lib.eachSystem ["x86_64-linux"] (system: + inputs.mypackages.url = "path:../mypackages"; + outputs = { self, nixpkgs, surfer, flake-utils, mypackages }: flake-utils.lib.eachSystem ["x86_64-linux"] (system: let pkgs = import nixpkgs { inherit system; overlays = []; }; - nodeEnv = import ../../lib/node-env.nix; + nodeEnv = mypackages.mylibs.nodeEnv; inherit (pkgs) callPackage; in rec { packages.surfer = callPackage ./. { inherit nodeEnv; src = surfer; }; diff --git a/lib/default.nix b/lib/default.nix deleted file mode 100644 index 7b392f1..0000000 --- a/lib/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ pkgs }: -with pkgs; -rec { - flakeCompat = import ./flake-compat.nix; - nodeEnv = import ./node-env.nix; - - fetchedGithub = path: - let - json = lib.importJSON path; - in rec { - version = json.tag; - pname = json.meta.name; - name = "${pname}-${version}"; - src = fetchFromGitHub json.github; - }; -} // (if builtins.pathExists ./private then callPackage ./private {} else {}) diff --git a/lib/flake-compat-patched.nix b/lib/flake-compat-patched.nix deleted file mode 100644 index af98425..0000000 --- a/lib/flake-compat-patched.nix +++ /dev/null @@ -1,190 +0,0 @@ -# Compatibility function to allow flakes to be used by -# non-flake-enabled Nix versions. Given a source tree containing a -# 'flake.nix' and 'flake.lock' file, it fetches the flake inputs and -# calls the flake's 'outputs' function. It then returns an attrset -# containing 'defaultNix' (to be used in 'default.nix'), 'shellNix' -# (to be used in 'shell.nix'). - -{ src, system ? builtins.currentSystem or "unknown-system" }: - -let - - lockFilePath = src + "/flake.lock"; - - lockFile = builtins.fromJSON (builtins.readFile lockFilePath); - - fetchTree = - info: - if info.type == "github" then - { outPath = fetchTarball "https://api.${info.host or "github.com"}/repos/${info.owner}/${info.repo}/tarball/${info.rev}"; - rev = info.rev; - shortRev = builtins.substring 0 7 info.rev; - lastModified = info.lastModified; - lastModifiedDate = formatSecondsSinceEpoch info.lastModified; - narHash = info.narHash; - } - else if info.type == "git" then - { outPath = - builtins.fetchGit - ({ url = info.url; } - // (if info ? rev then { inherit (info) rev; } else {}) - // (if info ? ref then { inherit (info) ref; } else {}) - ); - lastModified = info.lastModified; - lastModifiedDate = formatSecondsSinceEpoch info.lastModified; - narHash = info.narHash; - } // (if info ? rev then { - rev = info.rev; - shortRev = builtins.substring 0 7 info.rev; - } else { - }) - else if info.type == "path" then - { outPath = builtins.toPath ( - if builtins.substring 0 1 info.path == "." - then builtins.toString src + "/" + info.path - else info.path - ); - narHash = info.narHash; - } - else if info.type == "tarball" then - { outPath = fetchTarball info.url; - narHash = info.narHash; - } - else if info.type == "gitlab" then - { inherit (info) rev narHash lastModified; - outPath = fetchTarball "https://${info.host or "gitlab.com"}/api/v4/projects/${info.owner}%2F${info.repo}/repository/archive.tar.gz?sha=${info.rev}"; - shortRev = builtins.substring 0 7 info.rev; - } - else - # FIXME: add Mercurial, tarball inputs. - throw "flake input has unsupported input type '${info.type}'"; - - callFlake4 = flakeSrc: locks: - let - flake = import (flakeSrc + "/flake.nix"); - - inputs = builtins.mapAttrs (n: v: - if v.flake or true - then callFlake4 (fetchTree (v.locked // v.info)) v.inputs - else fetchTree (v.locked // v.info)) locks; - - outputs = flakeSrc // (flake.outputs (inputs // {self = outputs;})); - in - assert flake.edition == 201909; - outputs; - - callLocklessFlake = flakeSrc: - let - flake = import (flakeSrc + "/flake.nix"); - outputs = flakeSrc // (flake.outputs ({ self = outputs; })); - in outputs; - - rootSrc = let - # Try to clean the source tree by using fetchGit, if this source - # tree is a valid git repository. - tryFetchGit = src: - if isGit && !isShallow - then - let res = builtins.fetchGit src; - in if res.rev == "0000000000000000000000000000000000000000" then removeAttrs res ["rev" "shortRev"] else res - else { outPath = src; }; - # NB git worktrees have a file for .git, so we don't check the type of .git - isGit = builtins.pathExists (src + "/.git"); - isShallow = builtins.pathExists (src + "/.git/shallow"); - - in - { lastModified = 0; lastModifiedDate = formatSecondsSinceEpoch 0; } - // (if src ? outPath then src else tryFetchGit src); - - # Format number of seconds in the Unix epoch as %Y%m%d%H%M%S. - formatSecondsSinceEpoch = t: - let - rem = x: y: x - x / y * y; - days = t / 86400; - secondsInDay = rem t 86400; - hours = secondsInDay / 3600; - minutes = (rem secondsInDay 3600) / 60; - seconds = rem t 60; - - # Courtesy of https://stackoverflow.com/a/32158604. - z = days + 719468; - era = (if z >= 0 then z else z - 146096) / 146097; - doe = z - era * 146097; - yoe = (doe - doe / 1460 + doe / 36524 - doe / 146096) / 365; - y = yoe + era * 400; - doy = doe - (365 * yoe + yoe / 4 - yoe / 100); - mp = (5 * doy + 2) / 153; - d = doy - (153 * mp + 2) / 5 + 1; - m = mp + (if mp < 10 then 3 else -9); - y' = y + (if m <= 2 then 1 else 0); - - pad = s: if builtins.stringLength s < 2 then "0" + s else s; - in "${toString y'}${pad (toString m)}${pad (toString d)}${pad (toString hours)}${pad (toString minutes)}${pad (toString seconds)}"; - - allNodes = - builtins.mapAttrs - (key: node: - let - sourceInfo = - if key == lockFile.root - then rootSrc - else fetchTree (node.info or {} // removeAttrs node.locked ["dir"]); - - subdir = if key == lockFile.root then "" else node.locked.dir or ""; - - flake = import (sourceInfo + (if subdir != "" then "/" else "") + subdir + "/flake.nix"); - - inputs = builtins.mapAttrs - (inputName: inputSpec: allNodes.${resolveInput inputSpec}) - (node.inputs or {}); - - # Resolve a input spec into a node name. An input spec is - # either a node name, or a 'follows' path from the root - # node. - resolveInput = inputSpec: - if builtins.isList inputSpec - then getInputByPath lockFile.root inputSpec - else inputSpec; - - # Follow an input path (e.g. ["dwarffs" "nixpkgs"]) from the - # root node, returning the final node. - getInputByPath = nodeName: path: - if path == [] - then nodeName - else - getInputByPath - # Since this could be a 'follows' input, call resolveInput. - (resolveInput lockFile.nodes.${nodeName}.inputs.${builtins.head path}) - (builtins.tail path); - - outputs = flake.outputs (inputs // { self = result; }); - - result = outputs // sourceInfo // { inherit inputs; inherit outputs; inherit sourceInfo; }; - in - if node.flake or true then - assert builtins.isFunction flake.outputs; - result - else - sourceInfo - ) - lockFile.nodes; - - result = - if !(builtins.pathExists lockFilePath) - then callLocklessFlake rootSrc - else if lockFile.version == 4 - then callFlake4 rootSrc (lockFile.inputs) - else if lockFile.version >= 5 && lockFile.version <= 7 - then allNodes.${lockFile.root} - else throw "lock file '${lockFilePath}' has unsupported version ${toString lockFile.version}"; - -in - rec { - defaultNix = - result - // (if result ? defaultPackage.${system} then { default = result.defaultPackage.${system}; } else {}); - - shellNix = - defaultNix - // (if result ? devShell.${system} then { default = result.devShell.${system}; } else {}); - } diff --git a/lib/flake-compat.nix b/lib/flake-compat.nix deleted file mode 100644 index d3daa10..0000000 --- a/lib/flake-compat.nix +++ /dev/null @@ -1,8 +0,0 @@ -src: -(import ./flake-compat-patched.nix { inherit src; }).defaultNix -# Until https://github.com/edolstra/flake-compat/pull/18 is accepted -# (import ( -# fetchTarball { -# url = "https://github.com/edolstra/flake-compat/archive/99f1c2157fba4bfe6211a321fd0ee43199025dbf.tar.gz"; -# sha256 = "0x2jn3vrawwv9xp15674wjz9pixwjyj3j771izayl962zziivbx2"; -# }) { inherit src; }).defaultNix diff --git a/modules/default.nix b/modules/default.nix index 84e151f..618b517 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,26 +1,28 @@ +flakes: let - flakeCompat = import ../lib/flake-compat.nix; - flakeLib = (flakeCompat ../flakes/lib).lib; + public = flakes.subflakes.public; + flakeLib = flakes.subflakes.public.lib.lib; in { - myids = (flakeCompat ../flakes/myuids).nixosModule; - secrets = flakeLib.withNarKeyCompat flakeCompat ../flakes/secrets "nixosModule"; - filesWatcher = flakeLib.withNarKeyCompat flakeCompat ../flakes/files-watcher "nixosModule"; + myids = public.myuids.nixosModule; + secrets = flakeLib.withNarKey public.secrets "nixosModule"; + #filesWatcher = flakeLib.withNarKey public.files-watcher "nixosModule"; webstats = ./webapps/webstats; - diaspora = (flakeCompat ../flakes/diaspora).nixosModule; - etherpad-lite = (flakeCompat ../flakes/etherpad-lite).nixosModule; - mastodon = (flakeCompat ../flakes/mastodon).nixosModule; - mediagoblin = (flakeCompat ../flakes/mediagoblin).nixosModule; - peertube = (flakeCompat ../flakes/peertube).nixosModule; - fiche = flakeLib.withNarKeyCompat flakeCompat ../flakes/fiche "nixosModule"; - paste = flakeLib.withNarKeyCompat flakeCompat ../flakes/paste "nixosModule"; + diaspora = public.diaspora.nixosModule; + etherpad-lite = public.etherpad-lite.nixosModule; + mastodon = public.mastodon.nixosModule; + mediagoblin = public.mediagoblin.nixosModule; + peertube = public.peertube.nixosModule; + fiche = flakeLib.withNarKey public.fiche "nixosModule"; - opendmarc = flakeLib.withNarKeyCompat flakeCompat ../flakes/opendmarc "nixosModule"; - openarc = flakeLib.withNarKeyCompat flakeCompat ../flakes/openarc "nixosModule"; + #paste = flakeLib.withNarKey public.paste "nixosModule"; + + #opendmarc = flakeLib.withNarKey public.opendmarc "nixosModule"; + #openarc = flakeLib.withNarKey public.openarc "nixosModule"; duplyBackup = ./duply_backup; - rsyncBackup = flakeLib.withNarKeyCompat flakeCompat ../flakes/rsync_backup "nixosModule"; + rsyncBackup = flakeLib.withNarKey public.rsync_backup "nixosModule"; naemon = ./naemon; php-application = ./websites/php-application.nix; diff --git a/modules/private/buildbot/default.nix b/modules/private/buildbot/default.nix index d9e5966..74001ac 100644 --- a/modules/private/buildbot/default.nix +++ b/modules/private/buildbot/default.nix @@ -148,7 +148,7 @@ in project_env = with lib.attrsets; mapAttrs' (k: v: nameValuePair "BUILDBOT_${k}" (if builtins.isFunction v then v pkgs else v)) project.environment // { - BUILDBOT_PROJECT_DIR = ./projects + "/${project.name}"; + BUILDBOT_PROJECT_DIR = (buildbot.buildbot_config project).src; BUILDBOT_WORKER_PORT = builtins.toString project.workerPort; BUILDBOT_HOST = config.hostEnv.fqdn; BUILDBOT_VIRT_URL = "qemu+ssh://libvirt@dilion.immae.eu/system"; diff --git a/modules/private/mail/milters.nix b/modules/private/mail/milters.nix index 57e0085..171d023 100644 --- a/modules/private/mail/milters.nix +++ b/modules/private/mail/milters.nix @@ -1,8 +1,8 @@ -{ lib, pkgs, config, name, ... }: +{ lib, pkgs, config, name, flakes, ... }: { imports = - builtins.attrValues (import ../../../lib/flake-compat.nix ../../../flakes/private/openarc).nixosModules - ++ builtins.attrValues (import ../../../lib/flake-compat.nix ../../../flakes/private/opendmarc).nixosModules; + builtins.attrValues flakes.subflakes.private.openarc.nixosModules + ++ builtins.attrValues flakes.subflakes.private.opendmarc.nixosModules; options.myServices.mail.milters.sockets = lib.mkOption { type = lib.types.attrsOf lib.types.path; diff --git a/modules/private/mail/postfix.nix b/modules/private/mail/postfix.nix index 89fd096..0e72641 100644 --- a/modules/private/mail/postfix.nix +++ b/modules/private/mail/postfix.nix @@ -231,8 +231,8 @@ ''; scripts = lib.attrsets.mapAttrs (n: v: toScript n ( - (pkgs.mylibs.flakeCompat - (builtins.fetchGit { url = v.src.url; ref = "master"; rev = v.src.rev; }) + (builtins.getFlake "git+${v.src.url}?rev=${v.src.rev}" + #(builtins.fetchGit { url = v.src.url; ref = "master"; rev = v.src.rev; }) ).outputs.envToScript.x86_64-linux config.secrets.fullPaths."postfix/scripts/${n}-env" ) diff --git a/modules/private/system.nix b/modules/private/system.nix index 1eea0f3..39ceba0 100644 --- a/modules/private/system.nix +++ b/modules/private/system.nix @@ -21,7 +21,7 @@ services.openssh.enable = true; - nixpkgs.overlays = builtins.attrValues (import ../../overlays) ++ [ + nixpkgs.overlays = builtins.attrValues (import ../.. {}).overlays ++ [ (self: super: { postgresql = self.postgresql_pam; mariadb = self.mariadb_pam; diff --git a/modules/private/system/backup-2.nix b/modules/private/system/backup-2.nix index 4510574..bbf9137 100644 --- a/modules/private/system/backup-2.nix +++ b/modules/private/system/backup-2.nix @@ -1,4 +1,4 @@ -{ config, pkgs, resources, name, lib, ... }: +{ config, pkgs, resources, name, lib, flakes, ... }: { deployment = { targetUser = "root"; @@ -23,7 +23,7 @@ boot.kernelPackages = pkgs.linuxPackages_latest; myEnv = import ../../../nixops/secrets/environment.nix; - imports = [ ] ++ builtins.attrValues (import ../..); + imports = [ ] ++ builtins.attrValues (import ../.. flakes); fileSystems = { "/backup2" = { diff --git a/modules/private/system/dilion.nix b/modules/private/system/dilion.nix index 1b51682..d3d18f5 100644 --- a/modules/private/system/dilion.nix +++ b/modules/private/system/dilion.nix @@ -1,4 +1,4 @@ -{ config, pkgs, name, lib, ... }: +{ config, pkgs, name, lib, flakes, ... }: { deployment = { targetUser = "root"; @@ -75,7 +75,7 @@ }; myServices.ssh.modules = [ config.myServices.ssh.predefinedModules.regular ]; - imports = builtins.attrValues (import ../..) ++ [ ./dilion/vms.nix ]; + imports = builtins.attrValues (import ../.. flakes) ++ [ ./dilion/vms.nix ]; system.nssModules = [ pkgs.libvirt ]; system.nssDatabases.hosts = lib.mkForce [ "files" "libvirt_guest" "mymachines" "dns" "myhostname" ]; diff --git a/modules/private/system/eldiron.nix b/modules/private/system/eldiron.nix index 091c9f4..453a208 100644 --- a/modules/private/system/eldiron.nix +++ b/modules/private/system/eldiron.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, pkgs, lib, flakes, ... }: { deployment = { targetUser = "root"; @@ -98,7 +98,7 @@ ]; }; - imports = builtins.attrValues (import ../..); + imports = builtins.attrValues (import ../.. flakes); myServices.buildbot.enable = true; myServices.databases.enable = true; diff --git a/modules/private/system/monitoring-1.nix b/modules/private/system/monitoring-1.nix index 71eee33..7255f2e 100644 --- a/modules/private/system/monitoring-1.nix +++ b/modules/private/system/monitoring-1.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, resources, ... }: +{ config, pkgs, lib, resources, flakes, ... }: { deployment = { targetUser = "root"; @@ -9,7 +9,7 @@ boot.kernelPackages = pkgs.linuxPackages_latest; myEnv = import ../../../nixops/secrets/environment.nix; - imports = [ ] ++ builtins.attrValues (import ../..); + imports = [ ] ++ builtins.attrValues (import ../.. flakes); myServices.monitoring.enable = true; myServices.monitoring.master = true; diff --git a/modules/private/system/quatresaisons.nix b/modules/private/system/quatresaisons.nix index 2938a34..8d5dd9a 100644 --- a/modules/private/system/quatresaisons.nix +++ b/modules/private/system/quatresaisons.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, pkgs, lib, flakes, ... }: let serverSpecificConfig = config.myEnv.serverSpecific.quatresaisons; yarnModules = pkgs.yarn2nix-moretea.mkYarnModules rec { @@ -208,8 +208,32 @@ in PATH_PASSWD_PROG = "/run/wrappers/bin/passwd"; buildFlags = [ "SSH_KEYSIGN=/run/wrappers/bin/ssh-keysign" ]; }); + programs.ssh.extraConfig = '' + Host xdej-backup + User immae + IdentityFile /root/.ssh/id_ed25519_xdej + Hostname localhost + HostKeyAlias xdej-backup + Port 2218 + ProxyJump quatra-for-xdej-backup + Host quatra-for-xdej-backup + User bouya + Hostname 4a.salle-s.org + IdentityFile /root/.ssh/id_ed25519_xdej + ''; + programs.ssh.knownHosts."4a.salle-s.org" = { + publicKey = "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAmF4DB20bfD3DdobUtjo9UoGGw6OICJY0Nb+tQo+3bwXskwBhx+KLAK6K9YKBTh0IrWAbfgQN1K48YNz0Lr7SF8yig3/WynuS323USsU9a7QjdIZ5VIsXWxFICmbfaN3OnCNJ1r2FvBrOKj6hZ5uCRBFm1zFz/smefWIjq0XJIiE="; + }; + programs.ssh.knownHosts."xdej-backup-rsa" = { + extraHostNames = [ "xdej-backup" ]; + publicKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCw9oCbeDEz99snJurJmUDDwD6qo+3AZg0HvdwYaORKXG30yPYwX10Ficck/mVKE+P8q35m3p/udjNo9o074kNc6t8FtQKkdLeuPU8V1C83brZmFoOgOp/I+ApTglTf7MSztZDfAwtvLKcRVgxk0rQBH2hkyqijwwvG7sn1K4hhuW6ayFGgj8nvZUMweHP0NdChkO3KyJ43kCGGytx1oDPk+kedKDfEFVrRWDJIvdOY5tbq5n2e56t9wpuCLr+y6dyqBzUD4Y8kOhgy+THxJHIF1xkHvPRWVIe/ynt3kW11Ja51BYeLIF82yUgr7skS5Tbmg58LrO4Ojo7paobA24erCeJ31QVV4KbdVBw1qAB5FXXj8LSRfcE8DgLiANfZZim32PD8rrwVlOxZGxsx30BQ5G2fFhW55uygYsK2wXvuTVi+OFp/lYyBIPcviFs4Kp499AK0VG90Aq2ea0h5465NZOonXpOuHLgxNdCHtDAmWrLYBEiwwLB3+98zQO+o/xTWvMh6BjG+wa5aLo0X/yypOAEuGLYvwZCB1HEUIYk5sYMbNlXeRD1vi2Y6QjUpvufBoRY4T5khMskwupsAt02J9rMcLw29pZ5m2G5MRb7cDZDXqXUCOvKOd48ORIYuT6FunmhdakjmXe/9pHcX3AGJx6HJ7HJE9CDd04rzzRvGTQ=="; + }; + programs.ssh.knownHosts."xdej-backup-ed25519" = { + extraHostNames = [ "xdej-backup" ]; + publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN4vTu1P32+Kx+TpWG1G9WiOknjSyFEBCaE5nQInxG5j"; + }; - imports = builtins.attrValues (import ../..) ++ + imports = builtins.attrValues (import ../.. flakes) ++ [ ./quatresaisons/nextcloud.nix ./quatresaisons/databases.nix ]; myEnv = import ../../../nixops/secrets/environment.nix; @@ -457,6 +481,9 @@ in install -d -m 0750 -o wwwrun -g wwwrun /var/lib/php/sessions ''; + services.cron.systemCronJobs = [ + "0 22 * * * root ${./quatresaisons/xdej-backup.sh}" + ]; services.phpfpm = { phpOptions = '' session.save_path = "/var/lib/php/sessions" diff --git a/modules/private/system/quatresaisons/xdej-backup.sh b/modules/private/system/quatresaisons/xdej-backup.sh new file mode 100755 index 0000000..cebc2f5 --- /dev/null +++ b/modules/private/system/quatresaisons/xdej-backup.sh @@ -0,0 +1,27 @@ +#!/usr/bin/env bash + +set -euo pipefail + +BASE='/(/immae/' +BAK_BASE="$BASE/older" +CURRENT="$BASE/backup" +NBR=7 + +ssh xdej-backup < + Alias /static ${copanier}/${copanier.python.sitePackages}/copanier/static + AllowOverride None Require all granted @@ -59,7 +60,7 @@ in { EnvironmentFile = config.secrets.fullPaths."websites/nicecoop/copanier"; Type = "simple"; ExecStart = let - python = pkgs.webapps.copanier.python.withPackages (p: [ p.gunicorn p.uvloop pkgs.webapps.copanier ]); + python = copanier.python.withPackages (p: [ p.gunicorn p.uvloop copanier ]); in "${python}/bin/gunicorn -k roll.worker.Worker copanier:app --bind unix:${socket}"; User = "wwwrun"; diff --git a/modules/private/websites/syden/peertube.nix b/modules/private/websites/syden/peertube.nix index 64d4a5d..5cc6b6a 100644 --- a/modules/private/websites/syden/peertube.nix +++ b/modules/private/websites/syden/peertube.nix @@ -1,9 +1,9 @@ -{ lib, pkgs, config, ... }: +{ lib, pkgs, config, flakes, ... }: let scfg = config.myServices.websites.syden.peertube; name = "peertube"; dataDir = "/var/lib/syden_peertube"; - package = (pkgs.mylibs.flakeCompat ../../../../flakes/private/peertube).packages.x86_64-linux.peertube_syden; + package = flakes.subflakes.private.peertube.packages.x86_64-linux.peertube_syden; env = config.myEnv.tools.syden_peertube; in { diff --git a/modules/private/websites/tools/ether/default.nix b/modules/private/websites/tools/ether/default.nix index e977316..a07048d 100644 --- a/modules/private/websites/tools/ether/default.nix +++ b/modules/private/websites/tools/ether/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, ... }: +{ lib, pkgs, config, flakes, ... }: let env = config.myEnv.tools.etherpad-lite; cfg = config.myServices.websites.tools.etherpad-lite; @@ -173,7 +173,7 @@ in { }; services.etherpad-lite = { enable = true; - package = pkgs.webapps.etherpad-lite.withModules (p: [ + package = flakes.subflakes.public.etherpad-lite.defaultPackage.x86_64-linux.withModules (p: [ p.ep_align p.ep_bookmark p.ep_colors p.ep_comments_page p.ep_cursortrace p.ep_delete_empty_pads p.ep_embedmedia p.ep_font_size p.ep_headings2 p.ep_immae_buttons p.ep_ldapauth diff --git a/modules/private/websites/tools/mgoblin/default.nix b/modules/private/websites/tools/mgoblin/default.nix index 24bb5c4..2888187 100644 --- a/modules/private/websites/tools/mgoblin/default.nix +++ b/modules/private/websites/tools/mgoblin/default.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, config, ... }: +{ lib, pkgs, config, flakes, ... }: let env = config.myEnv.tools.mediagoblin; cfg = config.myServices.websites.tools.mediagoblin; @@ -102,7 +102,7 @@ in { services.mediagoblin = { enable = true; - package = pkgs.webapps.mediagoblin.withPlugins (p: [p.basicsearch]); + package = flakes.subflakes.public.mediagoblin.defaultPackage.x86_64-linux.withPlugins (p: [p.basicsearch]); configFile = config.secrets.fullPaths."webapps/tools-mediagoblin"; }; services.filesWatcher.mediagoblin-web = { diff --git a/modules/private/websites/tools/tools/default.nix b/modules/private/websites/tools/tools/default.nix index fd31984..29440ab 100644 --- a/modules/private/websites/tools/tools/default.nix +++ b/modules/private/websites/tools/tools/default.nix @@ -1,7 +1,5 @@ -{ lib, pkgs, config, ... }: +{ lib, pkgs, config, flakes, ... }: let - flakeCompat = import ../../../../../lib/flake-compat.nix; - adminer = pkgs.callPackage ./adminer.nix {}; ympd = pkgs.callPackage ./ympd.nix { env = config.myEnv.tools.ympd; @@ -47,7 +45,7 @@ let inherit config; }; grocy = pkgs.callPackage ./grocy.nix { - grocy = pkgs.webapps.grocy.override { composerEnv = pkgs.composerEnv.override { php = pkgs.php72; }; }; + grocy = flakes.subflakes.public.grocy.defaultPackage.x86_64-linux.override { composerEnv = pkgs.composerEnv.override { php = pkgs.php72; }; }; }; phpbb = pkgs.callPackage ./phpbb.nix { phpbb = (pkgs.webapps.phpbb.withLangs (l: [ l.fr ])).withExts (e: [ @@ -75,7 +73,7 @@ let pcfg = config.services.phpfpm.pools; in { imports = - builtins.attrValues (flakeCompat ../../../../../flakes/private/paste).nixosModules; + builtins.attrValues flakes.subflakes.private.paste.nixosModules; options.myServices.websites.tools.tools = { enable = lib.mkEnableOption "enable tools website"; diff --git a/nix b/nix new file mode 120000 index 0000000..f3f4251 --- /dev/null +++ b/nix @@ -0,0 +1 @@ +flakes/mypackages/sources \ No newline at end of file diff --git a/nixops/default.nix b/nixops/default.nix index 96296df..6d4f97f 100644 --- a/nixops/default.nix +++ b/nixops/default.nix @@ -1,5 +1,6 @@ { meta.nixpkgs = import { overlays = []; }; + meta.specialArgs = { flakes = builtins.getFlake "path:${builtins.toString ./..}"; }; dilion = import ../modules/private/system/dilion.nix; eldiron = import ../modules/private/system/eldiron.nix; backup-2 = import ../modules/private/system/backup-2.nix; diff --git a/overlays/shaarli/default.nix b/overlays/shaarli/default.nix deleted file mode 100644 index e1ff191..0000000 --- a/overlays/shaarli/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -self: super: { - shaarli = self.callPackage ../../pkgs/shaarli {}; -} diff --git a/overlays/ympd/default.nix b/overlays/ympd/default.nix deleted file mode 100644 index dda17aa..0000000 --- a/overlays/ympd/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -self: super: { - ympd = super.ympd.overrideAttrs(old: self.mylibs.fetchedGithub ./ympd.json // { - patches = (old.patches or []) ++ [ ./ympd-password-env.patch ]; - }); -} diff --git a/overlays/ympd/ympd.json b/overlays/ympd/ympd.json deleted file mode 100644 index 51f06d5..0000000 --- a/overlays/ympd/ympd.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "tag": "612f8fc-master", - "meta": { - "name": "ympd", - "url": "https://github.com/notandy/ympd", - "branch": "master" - }, - "github": { - "owner": "notandy", - "repo": "ympd", - "rev": "612f8fc0b2c47fc89d403e4a044541c6b2b238c8", - "sha256": "01hnj10zl103mrn82vyd42fvq7w5az3jf1qz18889zv67kn73ll9", - "fetchSubmodules": true - } -} diff --git a/pkgs/cnagios/cnagios.json b/pkgs/cnagios/cnagios.json deleted file mode 100644 index 4c1c385..0000000 --- a/pkgs/cnagios/cnagios.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "tag": "3bd27fb-master", - "meta": { - "name": "cnagios", - "url": "https://github.com/dannywarren/cnagios", - "branch": "master" - }, - "github": { - "owner": "dannywarren", - "repo": "cnagios", - "rev": "3bd27fb40e68f61ffd01bea6234b919a667b6fe4", - "sha256": "0iy5pmlcz6y3if72nav22xqxniiv1v8ywi0927m6s459hkw5n2rb", - "fetchSubmodules": true - } -} diff --git a/pkgs/crypto/cardano/daedalus.json b/pkgs/crypto/cardano/daedalus.json deleted file mode 100644 index dcd14c5..0000000 --- a/pkgs/crypto/cardano/daedalus.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "tag": "0.15.1", - "meta": { - "name": "daedalus", - "url": "https://github.com/input-output-hk/daedalus", - "branch": "refs/tags/0.15.1" - }, - "github": { - "owner": "input-output-hk", - "repo": "daedalus", - "rev": "998fd3189c9a54fac496dfef7a6224714c67bc80", - "sha256": "1r3gwfv6hn7lzp4h2s6849m7x12nxadsql358ss615krvdlnb6rr", - "fetchSubmodules": true - } -} diff --git a/pkgs/crypto/iota-cli-app/iota-cli-app.json b/pkgs/crypto/iota-cli-app/iota-cli-app.json deleted file mode 100644 index 6b47dec..0000000 --- a/pkgs/crypto/iota-cli-app/iota-cli-app.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "tag": "d7e2e08-master", - "meta": { - "name": "iota-cli-app", - "url": "https://github.com/iotaledger/cli-app", - "branch": "master" - }, - "github": { - "owner": "iotaledger", - "repo": "cli-app", - "rev": "d7e2e0856ae6bd34890fefb4245c07cd467a5032", - "sha256": "1n9kczsxdgjv8282nj2grlijvxipiskx0ndn169vz6v1l1hrwc8b", - "fetchSubmodules": true - } -} diff --git a/pkgs/dovecot/plugins/deleted_to_trash/dovecot-deleted_to_trash.json b/pkgs/dovecot/plugins/deleted_to_trash/dovecot-deleted_to_trash.json deleted file mode 100644 index 2987a02..0000000 --- a/pkgs/dovecot/plugins/deleted_to_trash/dovecot-deleted_to_trash.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "tag": "81b0754-master", - "meta": { - "name": "dovecot-deleted_to_trash", - "url": "https://github.com/lexbrugman/dovecot_deleted_to_trash", - "branch": "master" - }, - "github": { - "owner": "lexbrugman", - "repo": "dovecot_deleted_to_trash", - "rev": "81b07549accfc36467bf8527a53c295c7a02dbb9", - "sha256": "1b3k31g898s4fa0a9l4kvjsdyds772waaay84sjdxv09jw6mqs0f", - "fetchSubmodules": true - } -} diff --git a/pkgs/flrn/flrn.json b/pkgs/flrn/flrn.json deleted file mode 100644 index 3d7a944..0000000 --- a/pkgs/flrn/flrn.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "tag": "860d642-master", - "meta": { - "name": "flrn", - "url": "https://github.com/Cigaes/flrn", - "branch": "master" - }, - "github": { - "owner": "Cigaes", - "repo": "flrn", - "rev": "860d642bd6389a209c8b697bd044f78d23406509", - "sha256": "0sqlxxpy1xg7cb2hbxcr0al46nyr6jjnns4b5i8w04z5sypa9r5c", - "fetchSubmodules": true - } -} diff --git a/pkgs/mutt-ics/default.nix b/pkgs/mutt-ics/default.nix deleted file mode 100644 index a8a529b..0000000 --- a/pkgs/mutt-ics/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ python3Packages, mylibs }: -with python3Packages; -buildPythonApplication (mylibs.fetchedGithub ./mutt-ics.json // { - propagatedBuildInputs = [ icalendar ]; -}) diff --git a/pkgs/mutt-ics/mutt-ics.json b/pkgs/mutt-ics/mutt-ics.json deleted file mode 100644 index ae8ed37..0000000 --- a/pkgs/mutt-ics/mutt-ics.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "tag": "d291187-master", - "meta": { - "name": "mutt-ics", - "url": "https://github.com/dmedvinsky/mutt-ics", - "branch": "master" - }, - "github": { - "owner": "dmedvinsky", - "repo": "mutt-ics", - "rev": "d29118788f291f67d34fefa6eda9f95846a2fe34", - "sha256": "0kqzngsvzjq5gpf60jhfmb2xzjznvk172khf4dlcb72n3ak4rb92", - "fetchSubmodules": true - } -} diff --git a/pkgs/naemon-livestatus/naemon-livestatus.json b/pkgs/naemon-livestatus/naemon-livestatus.json deleted file mode 100644 index c648d2b..0000000 --- a/pkgs/naemon-livestatus/naemon-livestatus.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "tag": "33dbcfe-master", - "meta": { - "name": "naemon-livestatus", - "url": "https://github.com/naemon/naemon-livestatus", - "branch": "master" - }, - "github": { - "owner": "naemon", - "repo": "naemon-livestatus", - "rev": "33dbcfe18e42158f25c27cff95a1e07b73be53b0", - "sha256": "16jk0c6pwr7ck0g6s12hj6czbhgdr7c7f74zzsp5279af86y8fd6", - "fetchSubmodules": true - } -} diff --git a/pkgs/naemon/naemon.json b/pkgs/naemon/naemon.json deleted file mode 100644 index 2dc9809..0000000 --- a/pkgs/naemon/naemon.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "tag": "d7ac1c8-master", - "meta": { - "name": "naemon", - "url": "https://github.com/naemon/naemon-core", - "branch": "master" - }, - "github": { - "owner": "naemon", - "repo": "naemon-core", - "rev": "d7ac1c824e01dbb1c4a6bd0550b324e7cf165d54", - "sha256": "003grwciplnqfn9jh2km2pm6xxp8fxvmwihg3vmch8f0vfwcmv1m", - "fetchSubmodules": true - } -} diff --git a/pkgs/nagios-cli/default.nix b/pkgs/nagios-cli/default.nix deleted file mode 100644 index 7d7e7cc..0000000 --- a/pkgs/nagios-cli/default.nix +++ /dev/null @@ -1,2 +0,0 @@ -{ python2Packages, mylibs }: -python2Packages.buildPythonApplication (mylibs.fetchedGithub ./nagios-cli.json) diff --git a/pkgs/nagios-cli/nagios-cli.json b/pkgs/nagios-cli/nagios-cli.json deleted file mode 100644 index fc91227..0000000 --- a/pkgs/nagios-cli/nagios-cli.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "tag": "edc51ea-master", - "meta": { - "name": "nagios-cli", - "url": "https://github.com/tehmaze/nagios-cli", - "branch": "master" - }, - "github": { - "owner": "tehmaze", - "repo": "nagios-cli", - "rev": "edc51eaccf1086bb4469ce45c5e5155f2d71a2f9", - "sha256": "1qw5fv4niz079zqwmfr3kzjv8cc31rbhi9whdbv9c32qdi3h7vsp", - "fetchSubmodules": true - } -} diff --git a/pkgs/nagnu/default.nix b/pkgs/nagnu/default.nix deleted file mode 100644 index 2b9c0ec..0000000 --- a/pkgs/nagnu/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ stdenv, mylibs, ncurses, curl }: -stdenv.mkDerivation (mylibs.fetchedGithub ./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 - ''; -}) diff --git a/pkgs/nagnu/nagnu.json b/pkgs/nagnu/nagnu.json deleted file mode 100644 index 60a8b07..0000000 --- a/pkgs/nagnu/nagnu.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "tag": "c7e65fc-master", - "meta": { - "name": "nagnu", - "url": "https://github.com/frlen/nagnu", - "branch": "master" - }, - "github": { - "owner": "frlen", - "repo": "nagnu", - "rev": "c7e65fc02f46a3756a4cc47953ea2f3e57a84728", - "sha256": "1i2jm8ibvqcc734daamnzc3hx8q0nsry1x12q0kr5yvcsdjjgyy3", - "fetchSubmodules": true - } -} diff --git a/pkgs/predixy/default.nix b/pkgs/predixy/default.nix deleted file mode 100644 index 7e7a9ba..0000000 --- a/pkgs/predixy/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, mylibs }: -stdenv.mkDerivation (mylibs.fetchedGithub ./predixy.json // { - installPhase = '' - mkdir -p $out/bin - cp src/predixy $out/bin - mkdir -p $out/share - cp -r doc $out/share - cp -r conf $out/share/doc - ''; -}) diff --git a/pkgs/predixy/predixy.json b/pkgs/predixy/predixy.json deleted file mode 100644 index 9f9759c..0000000 --- a/pkgs/predixy/predixy.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "tag": "dacf3fb-master", - "meta": { - "name": "predixy", - "url": "https://github.com/joyieldInc/predixy", - "branch": "master" - }, - "github": { - "owner": "joyieldInc", - "repo": "predixy", - "rev": "dacf3fb30c2602dc044040df04e194d44b49c1be", - "sha256": "0sbvy0jg551lwkfq8qh0a49cl9mhfnkhi3cnk25l8pz4jcdrr9k9", - "fetchSubmodules": true - } -} diff --git a/pkgs/shaarli/shaarli_ldap.patch b/pkgs/shaarli/shaarli_ldap.patch deleted file mode 100644 index e66a54f..0000000 --- a/pkgs/shaarli/shaarli_ldap.patch +++ /dev/null @@ -1,425 +0,0 @@ -commit a19c24edc1057bd411821f9e3e7d1d309d38b1bb -Author: Ismaël Bouya -Date: Sun Feb 3 20:58:18 2019 +0100 - - Add ldap connection - -diff --git a/.htaccess b/.htaccess -index 4c00427..5acd708 100644 ---- a/.htaccess -+++ b/.htaccess -@@ -6,10 +6,23 @@ RewriteEngine On - # Prevent accessing subdirectories not managed by SCM - RewriteRule ^(.git|doxygen|vendor) - [F] - -+RewriteCond %{REQUEST_URI}::$1 ^(/.+)/(.*)::\2$ -+RewriteRule ^(.*) - [E=BASE:%1] -+ -+RewriteCond %{ENV:REDIRECT_BASE} (.+) -+RewriteRule .* - [E=BASE:%1] -+ - # Forward the "Authorization" HTTP header - RewriteCond %{HTTP:Authorization} ^(.*) - RewriteRule .* - [e=HTTP_AUTHORIZATION:%1] - -+RewriteCond %{REQUEST_FILENAME} !-f -+RewriteCond %{REQUEST_FILENAME} !-d -+RewriteRule ^((?!api/)[^/]*)/?(.*)$ $2?%{QUERY_STRING} [E=USERSPACE:$1] -+ -+RewriteCond %{ENV:REDIRECT_USERSPACE} (.+) -+RewriteRule .* - [E=USERSPACE:%1] -+ - # REST API - RewriteCond %{REQUEST_FILENAME} !-f - RewriteCond %{REQUEST_FILENAME} !-d -diff --git a/application/ApplicationUtils.php b/application/ApplicationUtils.php -index 911873a..f21a1ef 100644 ---- a/application/ApplicationUtils.php -+++ b/application/ApplicationUtils.php -@@ -191,6 +191,9 @@ public static function checkResourcePermissions($conf) - $conf->get('resource.page_cache'), - $conf->get('resource.raintpl_tmp'), - ) as $path) { -+ if (! is_dir($path)) { -+ mkdir($path, 0755, true); -+ } - if (! is_readable(realpath($path))) { - $errors[] = '"'.$path.'" '. t('directory is not readable'); - } -diff --git a/application/config/ConfigManager.php b/application/config/ConfigManager.php -index 32aaea4..99efc15 100644 ---- a/application/config/ConfigManager.php -+++ b/application/config/ConfigManager.php -@@ -21,6 +21,11 @@ class ConfigManager - - public static $DEFAULT_PLUGINS = array('qrcode'); - -+ /** -+ * @var string User space. -+ */ -+ protected $userSpace; -+ - /** - * @var string Config folder. - */ -@@ -41,12 +46,36 @@ class ConfigManager - * - * @param string $configFile Configuration file path without extension. - */ -- public function __construct($configFile = 'data/config') -+ public function __construct($configFile = null, $userSpace = null) - { -- $this->configFile = $configFile; -+ $this->userSpace = $this->findLDAPUser($userSpace); -+ if ($configFile !== null) { -+ $this->configFile = $configFile; -+ } else { -+ $this->configFile = ($this->userSpace === null) ? 'data/config' : 'data/' . $this->userSpace . '/config'; -+ } - $this->initialize(); - } - -+ public function findLDAPUser($login, $password = null) { -+ $connect = ldap_connect(getenv('SHAARLI_LDAP_HOST')); -+ ldap_set_option($connect, LDAP_OPT_PROTOCOL_VERSION, 3); -+ if (!$connect || !ldap_bind($connect, getenv('SHAARLI_LDAP_DN'), getenv('SHAARLI_LDAP_PASSWORD'))) { -+ return false; -+ } -+ -+ $search_query = str_replace('%login%', ldap_escape($login), getenv('SHAARLI_LDAP_FILTER')); -+ -+ $search = ldap_search($connect, getenv('SHAARLI_LDAP_BASE'), $search_query); -+ $info = ldap_get_entries($connect, $search); -+ -+ if (ldap_count_entries($connect, $search) == 1 && (is_null($password) || ldap_bind($connect, $info[0]["dn"], $password))) { -+ return $login; -+ } else { -+ return null; -+ } -+ } -+ - /** - * Reset the ConfigManager instance. - */ -@@ -269,6 +298,16 @@ public function getConfigFileExt() - return $this->configFile . $this->configIO->getExtension(); - } - -+ /** -+ * Get the current userspace. -+ * -+ * @return mixed User space. -+ */ -+ public function getUserSpace() -+ { -+ return $this->userSpace; -+ } -+ - /** - * Recursive function which find asked setting in the loaded config. - * -@@ -342,19 +381,31 @@ protected static function removeConfig($settings, &$conf) - */ - protected function setDefaultValues() - { -- $this->setEmpty('resource.data_dir', 'data'); -- $this->setEmpty('resource.config', 'data/config.php'); -- $this->setEmpty('resource.datastore', 'data/datastore.php'); -- $this->setEmpty('resource.ban_file', 'data/ipbans.php'); -- $this->setEmpty('resource.updates', 'data/updates.txt'); -- $this->setEmpty('resource.log', 'data/log.txt'); -- $this->setEmpty('resource.update_check', 'data/lastupdatecheck.txt'); -- $this->setEmpty('resource.history', 'data/history.php'); -+ if ($this->userSpace === null) { -+ $data = 'data'; -+ $tmp = 'tmp'; -+ $cache = 'cache'; -+ $pagecache = 'pagecache'; -+ } else { -+ $data = 'data/' . ($this->userSpace); -+ $tmp = 'tmp/' . ($this->userSpace); -+ $cache = 'cache/' . ($this->userSpace); -+ $pagecache = 'pagecache/' . ($this->userSpace); -+ } -+ -+ $this->setEmpty('resource.data_dir', $data); -+ $this->setEmpty('resource.config', $data . '/config.php'); -+ $this->setEmpty('resource.datastore', $data . '/datastore.php'); -+ $this->setEmpty('resource.ban_file', $data . '/ipbans.php'); -+ $this->setEmpty('resource.updates', $data . '/updates.txt'); -+ $this->setEmpty('resource.log', $data . '/log.txt'); -+ $this->setEmpty('resource.update_check', $data . '/lastupdatecheck.txt'); -+ $this->setEmpty('resource.history', $data . '/history.php'); - $this->setEmpty('resource.raintpl_tpl', 'tpl/'); - $this->setEmpty('resource.theme', 'default'); -- $this->setEmpty('resource.raintpl_tmp', 'tmp/'); -- $this->setEmpty('resource.thumbnails_cache', 'cache'); -- $this->setEmpty('resource.page_cache', 'pagecache'); -+ $this->setEmpty('resource.raintpl_tmp', $tmp); -+ $this->setEmpty('resource.thumbnails_cache', $cache); -+ $this->setEmpty('resource.page_cache', $pagecache); - - $this->setEmpty('security.ban_after', 4); - $this->setEmpty('security.ban_duration', 1800); -diff --git a/application/security/LoginManager.php b/application/security/LoginManager.php -index d6784d6..bdfaca7 100644 ---- a/application/security/LoginManager.php -+++ b/application/security/LoginManager.php -@@ -32,6 +32,9 @@ class LoginManager - /** @var string User sign-in token depending on remote IP and credentials */ - protected $staySignedInToken = ''; - -+ protected $lastErrorReason = ''; -+ protected $lastErrorIsBanishable = false; -+ - /** - * Constructor - * -@@ -83,7 +86,7 @@ public function getStaySignedInToken() - */ - public function checkLoginState($cookie, $clientIpId) - { -- if (! $this->configManager->exists('credentials.login')) { -+ if (! $this->configManager->exists('credentials.login') || (isset($_SESSION['username']) && $_SESSION['username'] && $this->configManager->get('credentials.login') !== $_SESSION['username'])) { - // Shaarli is not configured yet - $this->isLoggedIn = false; - return; -@@ -133,20 +136,40 @@ public function isLoggedIn() - */ - public function checkCredentials($remoteIp, $clientIpId, $login, $password) - { -- $hash = sha1($password . $login . $this->configManager->get('credentials.salt')); -+ $this->lastErrorIsBanishable = false; -+ -+ if ($this->configManager->getUserSpace() !== null && $this->configManager->getUserSpace() !== $login) { -+ logm($this->configManager->get('resource.log'), -+ $remoteIp, -+ 'Trying to login to wrong user space'); -+ $this->lastErrorReason = 'You’re trying to access the wrong account.'; -+ return false; -+ } - -- if ($login != $this->configManager->get('credentials.login') -- || $hash != $this->configManager->get('credentials.hash') -- ) { -+ logm($this->configManager->get('resource.log'), -+ $remoteIp, -+ 'Trying LDAP connection'); -+ $result = $this->configManager->findLDAPUser($login, $password); -+ if ($result === false) { - logm( - $this->configManager->get('resource.log'), - $remoteIp, -- 'Login failed for user ' . $login -+ 'Impossible to connect to LDAP' - ); -+ $this->lastErrorReason = 'Server error.'; -+ return false; -+ } else if (is_null($result)) { -+ logm( -+ $this->configManager->get('resource.log'), -+ $remoteIp, -+ 'Login failed for user ' . $login -+ ); -+ $this->lastErrorIsBanishable = true; -+ $this->lastErrorReason = 'Wrong login/password.'; - return false; - } - -- $this->sessionManager->storeLoginInfo($clientIpId); -+ $this->sessionManager->storeLoginInfo($clientIpId, $login); - logm( - $this->configManager->get('resource.log'), - $remoteIp, -@@ -187,6 +210,10 @@ protected function writeBanFile() - */ - public function handleFailedLogin($server) - { -+ if (!$this->lastErrorIsBanishable) { -+ return $this->lastErrorReason ?: 'Error during login.'; -+ }; -+ - $ip = $server['REMOTE_ADDR']; - $trusted = $this->configManager->get('security.trusted_proxies', []); - -@@ -215,6 +242,7 @@ public function handleFailedLogin($server) - ); - } - $this->writeBanFile(); -+ return $this->lastErrorReason ?: 'Error during login.'; - } - - /** -diff --git a/application/security/SessionManager.php b/application/security/SessionManager.php -index b8b8ab8..5eb4aac 100644 ---- a/application/security/SessionManager.php -+++ b/application/security/SessionManager.php -@@ -111,10 +111,10 @@ public static function checkId($sessionId) - * - * @param string $clientIpId Client IP address identifier - */ -- public function storeLoginInfo($clientIpId) -+ public function storeLoginInfo($clientIpId, $login = null) - { - $this->session['ip'] = $clientIpId; -- $this->session['username'] = $this->conf->get('credentials.login'); -+ $this->session['username'] = $login ?: $this->conf->get('credentials.login'); - $this->extendTimeValidityBy(self::$SHORT_TIMEOUT); - } - -diff --git a/index.php b/index.php -index 4b86a3e..58ae2dd 100644 ---- a/index.php -+++ b/index.php -@@ -121,7 +121,32 @@ - $_COOKIE['shaarli'] = session_id(); - } - --$conf = new ConfigManager(); -+$folderBase = getenv("BASE"); -+ -+if (getenv("USERSPACE")) { -+ if (isset($_GET["do"]) && $_GET["do"] == "login") { -+ header("Location: $folderBase/?do=login"); -+ exit; -+ } -+ $userspace = preg_replace("/[^-_A-Za-z0-9]/", '', getenv("USERSPACE")); -+} else if (isset($_SESSION["username"]) && $_SESSION["username"]) { -+ header("Location: " . $folderBase . "/" . $_SESSION["username"] . "?"); -+ exit; -+} else if (!isset($_GET["do"]) || $_GET["do"] != "login") { -+ header("Location: $folderBase/?do=login"); -+ exit; -+} -+ -+if (!isset($userspace) && isset($_POST["login"])) { -+ $userspace = preg_replace("/[^-_A-Za-z0-9]/", '', $_POST["login"]); -+ error_log("debugImmae: setting userspace from POST: " . $userspace); -+} -+ -+if (isset($userspace)) { -+ $conf = new ConfigManager(null, $userspace); -+} else { -+ $conf = new ConfigManager(); -+} - $sessionManager = new SessionManager($_SESSION, $conf); - $loginManager = new LoginManager($GLOBALS, $conf, $sessionManager); - $loginManager->generateStaySignedInToken($_SERVER['REMOTE_ADDR']); -@@ -175,7 +200,7 @@ - } - - // Display the installation form if no existing config is found -- install($conf, $sessionManager, $loginManager); -+ install($conf, $sessionManager, $loginManager, $userspace); - } - - $loginManager->checkLoginState($_COOKIE, $clientIpId); -@@ -205,6 +230,7 @@ function isLoggedIn() - && $loginManager->checkCredentials($_SERVER['REMOTE_ADDR'], $clientIpId, $_POST['login'], $_POST['password']) - ) { - $loginManager->handleSuccessfulLogin($_SERVER); -+ $userspace = $_POST['login']; - - $cookiedir = ''; - if (dirname($_SERVER['SCRIPT_NAME']) != '/') { -@@ -241,25 +267,25 @@ function isLoggedIn() - $uri .= '&'.$param.'='.urlencode($_GET[$param]); - } - } -- header('Location: '. $uri); -+ header('Location: '. $userspace . $uri); - exit; - } - - if (isset($_GET['edit_link'])) { -- header('Location: ?edit_link='. escape($_GET['edit_link'])); -+ header('Location: ' . $userspace . '?edit_link='. escape($_GET['edit_link'])); - exit; - } - - if (isset($_POST['returnurl'])) { - // Prevent loops over login screen. - if (strpos($_POST['returnurl'], 'do=login') === false) { -- header('Location: '. generateLocation($_POST['returnurl'], $_SERVER['HTTP_HOST'])); -+ header('Location: ' . generateLocation($_POST['returnurl'], $_SERVER['HTTP_HOST'])); - exit; - } - } -- header('Location: ?'); exit; -+ header('Location: '. $userspace . '?'); exit; - } else { -- $loginManager->handleFailedLogin($_SERVER); -+ $errorReason = $loginManager->handleFailedLogin($_SERVER); - $redir = '&username='. urlencode($_POST['login']); - if (isset($_GET['post'])) { - $redir .= '&post=' . urlencode($_GET['post']); -@@ -270,7 +296,7 @@ function isLoggedIn() - } - } - // Redirect to login screen. -- echo ''; -+ echo ''; - exit; - } - } -@@ -1719,7 +1745,7 @@ function buildLinkList($PAGE, $LINKSDB, $conf, $pluginManager, $loginManager) - * @param SessionManager $sessionManager SessionManager instance - * @param LoginManager $loginManager LoginManager instance - */ --function install($conf, $sessionManager, $loginManager) { -+function install($conf, $sessionManager, $loginManager, $userspace) { - // On free.fr host, make sure the /sessions directory exists, otherwise login will not work. - if (endsWith($_SERVER['HTTP_HOST'],'.free.fr') && !is_dir($_SERVER['DOCUMENT_ROOT'].'/sessions')) mkdir($_SERVER['DOCUMENT_ROOT'].'/sessions',0705); - -@@ -1755,7 +1781,7 @@ function install($conf, $sessionManager, $loginManager) { - } - - -- if (!empty($_POST['setlogin']) && !empty($_POST['setpassword'])) -+ if (true) - { - $tz = 'UTC'; - if (!empty($_POST['continent']) && !empty($_POST['city']) -@@ -1764,15 +1790,15 @@ function install($conf, $sessionManager, $loginManager) { - $tz = $_POST['continent'].'/'.$_POST['city']; - } - $conf->set('general.timezone', $tz); -- $login = $_POST['setlogin']; -- $conf->set('credentials.login', $login); -+ $conf->set('credentials.login', $userspace); - $salt = sha1(uniqid('', true) .'_'. mt_rand()); - $conf->set('credentials.salt', $salt); -- $conf->set('credentials.hash', sha1($_POST['setpassword'] . $login . $salt)); -+ $hash = sha1(uniqid('', true) .'_'. mt_rand()); -+ $conf->set('credentials.hash', $hash); - if (!empty($_POST['title'])) { - $conf->set('general.title', escape($_POST['title'])); - } else { -- $conf->set('general.title', 'Shared links on '.escape(index_url($_SERVER))); -+ $conf->set('general.title', ucwords(str_replace("_", " ", $userspace))); - } - $conf->set('translation.language', escape($_POST['language'])); - $conf->set('updates.check_updates', !empty($_POST['updateCheck'])); -@@ -1841,7 +1867,12 @@ function install($conf, $sessionManager, $loginManager) { - $app = new \Slim\App($container); - - // REST API routes --$app->group('/api/v1', function() { -+if (isset($userspace)) { -+ $mountpoint = '/' . $userspace . '/api/v1'; -+} else { -+ $mountpoint = '/api/v1'; -+} -+$app->group($mountpoint, function() { - $this->get('/info', '\Shaarli\Api\Controllers\Info:getInfo')->setName('getInfo'); - $this->get('/links', '\Shaarli\Api\Controllers\Links:getLinks')->setName('getLinks'); - $this->get('/links/{id:[\d]+}', '\Shaarli\Api\Controllers\Links:getLink')->setName('getLink'); -@@ -1860,7 +1891,7 @@ function install($conf, $sessionManager, $loginManager) { - $response = $app->run(true); - // Hack to make Slim and Shaarli router work together: - // If a Slim route isn't found and NOT API call, we call renderPage(). --if ($response->getStatusCode() == 404 && strpos($_SERVER['REQUEST_URI'], '/api/v1') === false) { -+if ($response->getStatusCode() == 404 && strpos($_SERVER['REQUEST_URI'], $mountpoint) === false) { - // We use UTF-8 for proper international characters handling. - header('Content-Type: text/html; charset=utf-8'); - renderPage($conf, $pluginManager, $linkDb, $history, $sessionManager, $loginManager); diff --git a/pkgs/status_engine/module.json b/pkgs/status_engine/module.json deleted file mode 100644 index 5ed06d2..0000000 --- a/pkgs/status_engine/module.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "tag": "d461e95-master", - "meta": { - "name": "statusengine-module", - "url": "https://github.com/statusengine/module", - "branch": "master" - }, - "github": { - "owner": "statusengine", - "repo": "module", - "rev": "d461e95a11fffaac604d11ac42d237b5e13071bc", - "sha256": "1awmq9rck9xy82pambnd2wh66ndif8x8jpk4qbbghs9f2sd48x1n", - "fetchSubmodules": true - } -} diff --git a/pkgs/status_engine/module.nix b/pkgs/status_engine/module.nix deleted file mode 100644 index 43d2b09..0000000 --- a/pkgs/status_engine/module.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ stdenv, mylibs, gearmand, json_c, libuuid, libevent, pkgconfig, glib }: -stdenv.mkDerivation (mylibs.fetchedGithub ./module.json // { - patches = [ ./host_perfdata.patch ]; - buildInputs = [ gearmand json_c libuuid libevent pkgconfig glib ]; - makeFlags = "all"; - installPhase = '' - mkdir -p $out/lib/status-engine - cp -a src/bin/* $out/lib/status-engine - ''; -}) diff --git a/pkgs/status_engine/worker.json b/pkgs/status_engine/worker.json deleted file mode 100644 index 301bab5..0000000 --- a/pkgs/status_engine/worker.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "tag": "02267d4-master", - "meta": { - "name": "worker", - "url": "https://github.com/statusengine/worker", - "branch": "master" - }, - "github": { - "owner": "statusengine", - "repo": "worker", - "rev": "02267d495ae69137d6765dc6b0f453f80216f1cf", - "sha256": "06ci4mkmifdf1z15yc8rxl44ppi45vjz4s136yaccq9d8vk9iyd4", - "fetchSubmodules": true - } -} diff --git a/pkgs/telegram-history-dump/default.nix b/pkgs/telegram-history-dump/default.nix deleted file mode 100644 index 050b351..0000000 --- a/pkgs/telegram-history-dump/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ stdenv, ruby, mylibs }: -stdenv.mkDerivation (mylibs.fetchedGithub ./telegram-history-dump.json // { - installPhase = '' - mkdir -p $out/lib $out/bin - cp -a $src $out/lib/telegram-history-dump - ln -s $out/lib/telegram-history-dump/telegram-history-dump.rb $out/bin/telegram-history-dump - ''; - buildInputs = [ ruby ]; -}) diff --git a/pkgs/telegram-history-dump/telegram-history-dump.json b/pkgs/telegram-history-dump/telegram-history-dump.json deleted file mode 100644 index 487df73..0000000 --- a/pkgs/telegram-history-dump/telegram-history-dump.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "tag": "468ea91-master", - "meta": { - "name": "telegram-history-dump", - "url": "https://github.com/tvdstaaij/telegram-history-dump", - "branch": "master" - }, - "github": { - "owner": "tvdstaaij", - "repo": "telegram-history-dump", - "rev": "468ea91e543529b54bc2c5ea28b1ea17f362fd3e", - "sha256": "1wmwiqacfa56bmwx50njnb15cg0fy6rbdrmrjd4xfbh8bs6yp0gh", - "fetchSubmodules": true - } -} diff --git a/pkgs/telegramircd/telegramircd.json b/pkgs/telegramircd/telegramircd.json deleted file mode 100644 index 3d219f8..0000000 --- a/pkgs/telegramircd/telegramircd.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "tag": "40a0c7c-master", - "meta": { - "name": "telegramircd", - "url": "https://github.com/MaskRay/telegramircd", - "branch": "master" - }, - "github": { - "owner": "MaskRay", - "repo": "telegramircd", - "rev": "40a0c7cf60492bde3f44d43f06f62e3792480139", - "sha256": "123fjhgxq2fzn0ar8274jv7jjbxnlpidrj5333kbch7rpcipks0y", - "fetchSubmodules": true - } -} diff --git a/pkgs/webapps/default.nix b/pkgs/webapps/default.nix deleted file mode 100644 index fc984aa..0000000 --- a/pkgs/webapps/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ callPackage, mylibs, composerEnv }: -rec { - adminer = callPackage ./adminer {}; - apache-theme = callPackage ./apache-theme {}; - awl = callPackage ./awl {}; - copanier = (mylibs.flakeCompat ../../flakes/copanier).default; - davical = callPackage ./davical {}; - diaspora = (mylibs.flakeCompat ../../flakes/diaspora).default; - dokuwiki = callPackage ./dokuwiki { inherit mylibs; }; - etherpad-lite = (mylibs.flakeCompat ../../flakes/etherpad-lite).default; - grocy = (mylibs.flakeCompat ../../flakes/grocy).default; - infcloud = callPackage ./infcloud {}; - mantisbt_2 = callPackage ./mantisbt_2 {}; - mastodon = (mylibs.flakeCompat ../../flakes/mastodon).default; - mediagoblin = (mylibs.flakeCompat ../../flakes/mediagoblin).default; - nextcloud_20 = callPackage ./nextcloud { nextcloudVersion = 20; }; - nextcloud_21 = callPackage ./nextcloud { nextcloudVersion = 21; }; - nextcloud_22 = callPackage ./nextcloud { nextcloudVersion = 22; }; - nextcloud_23 = callPackage ./nextcloud { nextcloudVersion = 23; }; - peertube = (mylibs.flakeCompat ../../flakes/peertube).default; - phpbb = callPackage ./phpbb {}; - phpldapadmin = callPackage ./phpldapadmin {}; - rompr = callPackage ./rompr { inherit mylibs; }; - roundcubemail = callPackage ./roundcubemail {}; - spip = callPackage ./spip {}; - surfer = (mylibs.flakeCompat ../../flakes/surfer).default; - taskwarrior-web = (mylibs.flakeCompat ../../flakes/taskwarrior-web).default; - ttrss = callPackage ./ttrss {}; - wallabag = callPackage ./wallabag { inherit composerEnv; }; - yourls = callPackage ./yourls { inherit mylibs; }; -} diff --git a/pkgs/webapps/dokuwiki/dokuwiki.json b/pkgs/webapps/dokuwiki/dokuwiki.json deleted file mode 100644 index fc03252..0000000 --- a/pkgs/webapps/dokuwiki/dokuwiki.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "tag": "release_stable_2018-04-22b", - "meta": { - "name": "dokuwiki", - "url": "https://github.com/splitbrain/dokuwiki", - "branch": "refs/tags/release_stable_2018-04-22b" - }, - "github": { - "owner": "splitbrain", - "repo": "dokuwiki", - "rev": "871dae1320b40211626c7ec665f5e6d5290aca95", - "sha256": "1syvd5dvv3v75swf8ig7dxqs0g5xikb0f6vlcy7g4c4ghldkw7nz", - "fetchSubmodules": true - } -} diff --git a/pkgs/webapps/etherpad-lite/default.nix b/pkgs/webapps/etherpad-lite/default.nix deleted file mode 100644 index 4327384..0000000 --- a/pkgs/webapps/etherpad-lite/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ varDir ? "/var/lib/etherpad-lite" # if you override this change the StateDirectory in service file too! -, stdenv, callPackage, mylibs, lib }: -let - nodeEnv = callPackage mylibs.nodeEnv {}; - moduleNames = [ - "ep_aa_file_menu_toolbar" "ep_adminpads" "ep_align" "ep_bookmark" - "ep_clear_formatting" "ep_colors" "ep_comments_page" - "ep_copy_paste_select_all" "ep_cursortrace" "ep_delete_empty_pads" - "ep_embedmedia" "ep_font_family" "ep_font_size" "ep_headings2" - "ep_immae_buttons" "ep_ldapauth" "ep_line_height" "ep_markdown" - "ep_mypads" "ep_page_view" "ep_previewimages" "ep_ruler" - "ep_scrollto" "ep_set_title_on_pad" "ep_subscript_and_superscript" - "ep_timesliderdiff" - ]; - # nix files are built using node2nix -i node-packages.json - allModules = lib.attrsets.genAttrs moduleNames - (name: (callPackage (./modules + "/${name}/node-packages.nix") { inherit nodeEnv; }).${name}); - toPassthru = pkg: { - inherit varDir allModules; - withModules = withModules pkg; - }; - withModules = pkg: toModules: - let - modules = toModules allModules; - toInstallModule = n: '' - cp -a ${n}/lib/node_modules/${n.packageName} $out/node_modules - if [ ! -f $out/node_modules/${n.packageName}/.ep_initialized ]; then - chmod u+w $out/node_modules/${n.packageName}/ - ln -s ${varDir}/ep_initialized/${n.packageName} $out/node_modules/${n.packageName}/.ep_initialized - fi - ''; - newEtherpad = pkg.overrideAttrs(old: { - installPhase = old.installPhase + "\n" + builtins.concatStringsSep "\n" (map toInstallModule modules); - passthru = toPassthru newEtherpad; - }); - in newEtherpad; - # built using node2nix -l package-lock.json - # and changing "./." to "src" - node-environment = (callPackage ./node-packages.nix { - inherit nodeEnv; - src = stdenv.mkDerivation (mylibs.fetchedGithub ./etherpad-lite.json // rec { - patches = [ ./libreoffice_patch.diff ]; - buildPhase = '' - touch src/.ep_initialized - ''; - installPhase = '' - cp -a src/ $out - ''; - }); - }).package; - package = stdenv.mkDerivation rec { - name = (mylibs.fetchedGithub ./etherpad-lite.json).name; - src = node-environment; - installPhase = '' - mkdir -p $out - mkdir $out/node_modules - cp -a lib/node_modules/ep_etherpad-lite $out/src - chmod u+w $out/src/static/js/ - ln -s ../src $out/node_modules/ep_etherpad-lite - ''; - passthru = toPassthru package; - }; -in package diff --git a/pkgs/webapps/etherpad-lite/etherpad-lite.json b/pkgs/webapps/etherpad-lite/etherpad-lite.json deleted file mode 100644 index 0d68df1..0000000 --- a/pkgs/webapps/etherpad-lite/etherpad-lite.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "tag": "1.8.3", - "meta": { - "name": "etherpad-lite", - "url": "https://github.com/ether/etherpad-lite", - "branch": "refs/tags/1.8.3" - }, - "github": { - "owner": "ether", - "repo": "etherpad-lite", - "rev": "62101147a0c3495dc80daa87ab53a3366321a205", - "sha256": "1d726qldw3bil4x7j39aqk7m71kyjvxklai5238rrd5v82z28c1y", - "fetchSubmodules": true - } -} diff --git a/pkgs/webapps/etherpad-lite/libreoffice_patch.diff b/pkgs/webapps/etherpad-lite/libreoffice_patch.diff deleted file mode 100644 index 86fac15..0000000 --- a/pkgs/webapps/etherpad-lite/libreoffice_patch.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/node/utils/LibreOffice.js b/src/node/utils/LibreOffice.js -index 267f7a0c..10518577 100644 ---- a/src/node/utils/LibreOffice.js -+++ b/src/node/utils/LibreOffice.js -@@ -78,6 +78,7 @@ function doConvertTask(task, callback) { - '--invisible', - '--nologo', - '--nolockcheck', -+ '-env:UserInstallation=file:///tmp/', - '--writer', - '--convert-to', task.type, - task.srcFile, diff --git a/pkgs/webapps/etherpad-lite/modules/ep_aa_file_menu_toolbar/node-packages.json b/pkgs/webapps/etherpad-lite/modules/ep_aa_file_menu_toolbar/node-packages.json deleted file mode 100644 index 9b0f681..0000000 --- a/pkgs/webapps/etherpad-lite/modules/ep_aa_file_menu_toolbar/node-packages.json +++ /dev/null @@ -1 +0,0 @@ -[ "ep_aa_file_menu_toolbar" ] diff --git a/pkgs/webapps/etherpad-lite/modules/ep_aa_file_menu_toolbar/node-packages.nix b/pkgs/webapps/etherpad-lite/modules/ep_aa_file_menu_toolbar/node-packages.nix deleted file mode 100644 index 8a2fb1b..0000000 --- a/pkgs/webapps/etherpad-lite/modules/ep_aa_file_menu_toolbar/node-packages.nix +++ /dev/null @@ -1,26 +0,0 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! - -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: - -let - sources = {}; -in -{ - ep_aa_file_menu_toolbar = nodeEnv.buildNodePackage { - name = "ep_aa_file_menu_toolbar"; - packageName = "ep_aa_file_menu_toolbar"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/ep_aa_file_menu_toolbar/-/ep_aa_file_menu_toolbar-0.1.6.tgz"; - sha1 = "aaa374d9429c9b2382311fab69e0ff819b53b7b0"; - }; - buildInputs = globalBuildInputs; - meta = { - description = "File / Menu style toolbar"; - homepage = https://github.com/JohnMcLear/ep_file_menu_toolbar; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; -} \ No newline at end of file diff --git a/pkgs/webapps/etherpad-lite/modules/ep_adminpads/node-packages.json b/pkgs/webapps/etherpad-lite/modules/ep_adminpads/node-packages.json deleted file mode 100644 index 7643607..0000000 --- a/pkgs/webapps/etherpad-lite/modules/ep_adminpads/node-packages.json +++ /dev/null @@ -1 +0,0 @@ -[ "ep_adminpads" ] diff --git a/pkgs/webapps/etherpad-lite/modules/ep_adminpads/node-packages.nix b/pkgs/webapps/etherpad-lite/modules/ep_adminpads/node-packages.nix deleted file mode 100644 index 2f62257..0000000 --- a/pkgs/webapps/etherpad-lite/modules/ep_adminpads/node-packages.nix +++ /dev/null @@ -1,27 +0,0 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! - -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: - -let - sources = {}; -in -{ - ep_adminpads = nodeEnv.buildNodePackage { - name = "ep_adminpads"; - packageName = "ep_adminpads"; - version = "0.0.12"; - src = fetchurl { - url = "https://github.com/spcsser/ep_adminpads/archive/master.tar.gz"; - sha1 = "49ypihbwxmd97g813aq2rjwh7pq1y08a"; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Gives the ability to list and administrate all pads on admin page"; - homepage = "https://github.com/spcsser/ep_adminpads#readme"; - license = "MIT"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; -} diff --git a/pkgs/webapps/etherpad-lite/modules/ep_align/node-packages.json b/pkgs/webapps/etherpad-lite/modules/ep_align/node-packages.json deleted file mode 100644 index 9405dd2..0000000 --- a/pkgs/webapps/etherpad-lite/modules/ep_align/node-packages.json +++ /dev/null @@ -1 +0,0 @@ -[ "ep_align" ] diff --git a/pkgs/webapps/etherpad-lite/modules/ep_align/node-packages.nix b/pkgs/webapps/etherpad-lite/modules/ep_align/node-packages.nix deleted file mode 100644 index 1a57a9c..0000000 --- a/pkgs/webapps/etherpad-lite/modules/ep_align/node-packages.nix +++ /dev/null @@ -1,26 +0,0 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! - -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: - -let - sources = {}; -in -{ - ep_align = nodeEnv.buildNodePackage { - name = "ep_align"; - packageName = "ep_align"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ep_align/-/ep_align-0.2.0.tgz"; - sha512 = "bMrwsieCfz3LkxuIXiNu7UKkUQ7b+ceI09XRd1cCMskDwuJow3N3hB4/gecqfF+v4lS0qmDEa7bJvSTrhHiXBQ=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Add Left/Center/Right/Justify to lines of text in a pad"; - homepage = "https://github.com/johnmclear/ep_align#readme"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; -} \ No newline at end of file diff --git a/pkgs/webapps/etherpad-lite/modules/ep_bookmark/node-packages.json b/pkgs/webapps/etherpad-lite/modules/ep_bookmark/node-packages.json deleted file mode 100644 index 80745ca..0000000 --- a/pkgs/webapps/etherpad-lite/modules/ep_bookmark/node-packages.json +++ /dev/null @@ -1 +0,0 @@ -[ "ep_bookmark" ] diff --git a/pkgs/webapps/etherpad-lite/modules/ep_bookmark/node-packages.nix b/pkgs/webapps/etherpad-lite/modules/ep_bookmark/node-packages.nix deleted file mode 100644 index 3975044..0000000 --- a/pkgs/webapps/etherpad-lite/modules/ep_bookmark/node-packages.nix +++ /dev/null @@ -1,26 +0,0 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! - -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: - -let - sources = {}; -in -{ - ep_bookmark = nodeEnv.buildNodePackage { - name = "ep_bookmark"; - packageName = "ep_bookmark"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ep_bookmark/-/ep_bookmark-1.2.0.tgz"; - sha512 = "sHTXIKui1l+PxeBtzlwSvRg8TZ8w9PE5aaxTg5b/siwNmprXeoiL6ZUiOTGmp18yLXs1ltJ2BzSqJX57pjGVWg=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Etherpad plugin for users to save a list of bookmarks of their visited pads locally in the browser's local storage"; - homepage = "https://github.com/Gared/ep_bookmark#readme"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; -} \ No newline at end of file diff --git a/pkgs/webapps/etherpad-lite/modules/ep_clear_formatting/node-packages.json b/pkgs/webapps/etherpad-lite/modules/ep_clear_formatting/node-packages.json deleted file mode 100644 index 07c0662..0000000 --- a/pkgs/webapps/etherpad-lite/modules/ep_clear_formatting/node-packages.json +++ /dev/null @@ -1 +0,0 @@ -[ "ep_clear_formatting" ] diff --git a/pkgs/webapps/etherpad-lite/modules/ep_clear_formatting/node-packages.nix b/pkgs/webapps/etherpad-lite/modules/ep_clear_formatting/node-packages.nix deleted file mode 100644 index adb22f1..0000000 --- a/pkgs/webapps/etherpad-lite/modules/ep_clear_formatting/node-packages.nix +++ /dev/null @@ -1,25 +0,0 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! - -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: - -let - sources = {}; -in -{ - ep_clear_formatting = nodeEnv.buildNodePackage { - name = "ep_clear_formatting"; - packageName = "ep_clear_formatting"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ep_clear_formatting/-/ep_clear_formatting-0.0.2.tgz"; - sha1 = "b16970b9c6be01246d23cb5a81777aa220d06fc4"; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Clear formatting on a selection, this plugin requires the file menu"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; -} \ No newline at end of file diff --git a/pkgs/webapps/etherpad-lite/modules/ep_colors/node-packages.json b/pkgs/webapps/etherpad-lite/modules/ep_colors/node-packages.json deleted file mode 100644 index b513f5c..0000000 --- a/pkgs/webapps/etherpad-lite/modules/ep_colors/node-packages.json +++ /dev/null @@ -1 +0,0 @@ -[ "ep_colors" ] diff --git a/pkgs/webapps/etherpad-lite/modules/ep_colors/node-packages.nix b/pkgs/webapps/etherpad-lite/modules/ep_colors/node-packages.nix deleted file mode 100644 index f2f8201..0000000 --- a/pkgs/webapps/etherpad-lite/modules/ep_colors/node-packages.nix +++ /dev/null @@ -1,25 +0,0 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! - -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: - -let - sources = {}; -in -{ - ep_colors = nodeEnv.buildNodePackage { - name = "ep_colors"; - packageName = "ep_colors"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ep_colors/-/ep_colors-0.0.3.tgz"; - sha1 = "aa95e1b12e009ed6b05d0ccb188ca4829e799780"; - }; - buildInputs = globalBuildInputs; - meta = { - description = "add colors to the etherpad"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; -} \ No newline at end of file diff --git a/pkgs/webapps/etherpad-lite/modules/ep_comments_page/node-packages.json b/pkgs/webapps/etherpad-lite/modules/ep_comments_page/node-packages.json deleted file mode 100644 index ae32884..0000000 --- a/pkgs/webapps/etherpad-lite/modules/ep_comments_page/node-packages.json +++ /dev/null @@ -1 +0,0 @@ -["ep_comments_page"] diff --git a/pkgs/webapps/etherpad-lite/modules/ep_comments_page/node-packages.nix b/pkgs/webapps/etherpad-lite/modules/ep_comments_page/node-packages.nix deleted file mode 100644 index 8d7c85a..0000000 --- a/pkgs/webapps/etherpad-lite/modules/ep_comments_page/node-packages.nix +++ /dev/null @@ -1,342 +0,0 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! - -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: - -let - sources = { - "after-0.8.2" = { - name = "after"; - packageName = "after"; - version = "0.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/after/-/after-0.8.2.tgz"; - sha1 = "fedb394f9f0e02aa9768e702bda23b505fae7e1f"; - }; - }; - "arraybuffer.slice-0.0.7" = { - name = "arraybuffer.slice"; - packageName = "arraybuffer.slice"; - version = "0.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz"; - sha512 = "wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog=="; - }; - }; - "async-limiter-1.0.1" = { - name = "async-limiter"; - packageName = "async-limiter"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz"; - sha512 = "csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ=="; - }; - }; - "backo2-1.0.2" = { - name = "backo2"; - packageName = "backo2"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz"; - sha1 = "31ab1ac8b129363463e35b3ebb69f4dfcfba7947"; - }; - }; - "base64-arraybuffer-0.1.5" = { - name = "base64-arraybuffer"; - packageName = "base64-arraybuffer"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz"; - sha1 = "73926771923b5a19747ad666aa5cd4bf9c6e9ce8"; - }; - }; - "better-assert-1.0.2" = { - name = "better-assert"; - packageName = "better-assert"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz"; - sha1 = "40866b9e1b9e0b55b481894311e68faffaebc522"; - }; - }; - "blob-0.0.5" = { - name = "blob"; - packageName = "blob"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz"; - sha512 = "gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig=="; - }; - }; - "callsite-1.0.0" = { - name = "callsite"; - packageName = "callsite"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz"; - sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20"; - }; - }; - "component-bind-1.0.0" = { - name = "component-bind"; - packageName = "component-bind"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz"; - sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"; - }; - }; - "component-emitter-1.2.1" = { - name = "component-emitter"; - packageName = "component-emitter"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz"; - sha1 = "137918d6d78283f7df7a6b7c5a63e140e69425e6"; - }; - }; - "component-inherit-0.0.3" = { - name = "component-inherit"; - packageName = "component-inherit"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz"; - sha1 = "645fc4adf58b72b649d5cae65135619db26ff143"; - }; - }; - "debug-3.1.0" = { - name = "debug"; - packageName = "debug"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"; - sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="; - }; - }; - "debug-4.1.1" = { - name = "debug"; - packageName = "debug"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz"; - sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw=="; - }; - }; - "engine.io-client-3.4.1" = { - name = "engine.io-client"; - packageName = "engine.io-client"; - version = "3.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.4.1.tgz"; - sha512 = "RJNmA+A9Js+8Aoq815xpGAsgWH1VoSYM//2VgIiu9lNOaHFfLpTjH4tOzktBpjIs5lvOfiNY1dwf+NuU6D38Mw=="; - }; - }; - "engine.io-parser-2.2.0" = { - name = "engine.io-parser"; - packageName = "engine.io-parser"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.2.0.tgz"; - sha512 = "6I3qD9iUxotsC5HEMuuGsKA0cXerGz+4uGcXQEkfBidgKf0amsjrrtwcbwK/nzpZBxclXlV7gGl9dgWvu4LF6w=="; - }; - }; - "formidable-1.2.2" = { - name = "formidable"; - packageName = "formidable"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/formidable/-/formidable-1.2.2.tgz"; - sha512 = "V8gLm+41I/8kguQ4/o1D3RIHRmhYFG4pnNyonvua+40rqcEmT4+V71yaZ3B457xbbgCsCfjSPi65u/W6vK1U5Q=="; - }; - }; - "has-binary2-1.0.3" = { - name = "has-binary2"; - packageName = "has-binary2"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz"; - sha512 = "G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw=="; - }; - }; - "has-cors-1.1.0" = { - name = "has-cors"; - packageName = "has-cors"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz"; - sha1 = "5e474793f7ea9843d1bb99c23eef49ff126fff39"; - }; - }; - "indexof-0.0.1" = { - name = "indexof"; - packageName = "indexof"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz"; - sha1 = "82dc336d232b9062179d05ab3293a66059fd435d"; - }; - }; - "isarray-2.0.1" = { - name = "isarray"; - packageName = "isarray"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz"; - sha1 = "a37d94ed9cda2d59865c9f76fe596ee1f338741e"; - }; - }; - "ms-2.0.0" = { - name = "ms"; - packageName = "ms"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; - sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; - }; - }; - "ms-2.1.2" = { - name = "ms"; - packageName = "ms"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; - sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; - }; - }; - "object-component-0.0.3" = { - name = "object-component"; - packageName = "object-component"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz"; - sha1 = "f0c69aa50efc95b866c186f400a33769cb2f1291"; - }; - }; - "parseqs-0.0.5" = { - name = "parseqs"; - packageName = "parseqs"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz"; - sha1 = "d5208a3738e46766e291ba2ea173684921a8b89d"; - }; - }; - "parseuri-0.0.5" = { - name = "parseuri"; - packageName = "parseuri"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz"; - sha1 = "80204a50d4dbb779bfdc6ebe2778d90e4bce320a"; - }; - }; - "socket.io-client-2.3.0" = { - name = "socket.io-client"; - packageName = "socket.io-client"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.3.0.tgz"; - sha512 = "cEQQf24gET3rfhxZ2jJ5xzAOo/xhZwK+mOqtGRg5IowZsMgwvHwnf/mCRapAAkadhM26y+iydgwsXGObBB5ZdA=="; - }; - }; - "socket.io-parser-3.3.0" = { - name = "socket.io-parser"; - packageName = "socket.io-parser"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.0.tgz"; - sha512 = "hczmV6bDgdaEbVqhAeVMM/jfUfzuEZHsQg6eOmLgJht6G3mPKMxYm75w2+qhAQZ+4X+1+ATZ+QFKeOZD5riHng=="; - }; - }; - "to-array-0.1.4" = { - name = "to-array"; - packageName = "to-array"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz"; - sha1 = "17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"; - }; - }; - "ws-6.1.4" = { - name = "ws"; - packageName = "ws"; - version = "6.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-6.1.4.tgz"; - sha512 = "eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA=="; - }; - }; - "xmlhttprequest-ssl-1.5.5" = { - name = "xmlhttprequest-ssl"; - packageName = "xmlhttprequest-ssl"; - version = "1.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz"; - sha1 = "c2876b06168aadc40e57d97e81191ac8f4398b3e"; - }; - }; - "yeast-0.1.2" = { - name = "yeast"; - packageName = "yeast"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz"; - sha1 = "008e06d8094320c372dbc2f8ed76a0ca6c8ac419"; - }; - }; - }; -in -{ - ep_comments_page = nodeEnv.buildNodePackage { - name = "ep_comments_page"; - packageName = "ep_comments_page"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ep_comments_page/-/ep_comments_page-0.1.0.tgz"; - sha512 = "aHUfyR3HZ677wgL1hJEeaa1yIabW3PjaFXHhWnlEXdIDXL3WmgkGQ4Y1ccHp057EmquCwNb595HADQO+QUK/lw=="; - }; - dependencies = [ - sources."after-0.8.2" - sources."arraybuffer.slice-0.0.7" - sources."async-limiter-1.0.1" - sources."backo2-1.0.2" - sources."base64-arraybuffer-0.1.5" - sources."better-assert-1.0.2" - sources."blob-0.0.5" - sources."callsite-1.0.0" - sources."component-bind-1.0.0" - sources."component-emitter-1.2.1" - sources."component-inherit-0.0.3" - sources."debug-4.1.1" - sources."engine.io-client-3.4.1" - sources."engine.io-parser-2.2.0" - sources."formidable-1.2.2" - sources."has-binary2-1.0.3" - sources."has-cors-1.1.0" - sources."indexof-0.0.1" - sources."isarray-2.0.1" - sources."ms-2.1.2" - sources."object-component-0.0.3" - sources."parseqs-0.0.5" - sources."parseuri-0.0.5" - sources."socket.io-client-2.3.0" - (sources."socket.io-parser-3.3.0" // { - dependencies = [ - sources."debug-3.1.0" - sources."ms-2.0.0" - ]; - }) - sources."to-array-0.1.4" - sources."ws-6.1.4" - sources."xmlhttprequest-ssl-1.5.5" - sources."yeast-0.1.2" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "Adds comments on sidebar and link it to the text. Support for Page View, requires ep_page_view"; - homepage = "https://github.com/ether/ep_comments#readme"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; -} \ No newline at end of file diff --git a/pkgs/webapps/etherpad-lite/modules/ep_copy_paste_select_all/node-packages.json b/pkgs/webapps/etherpad-lite/modules/ep_copy_paste_select_all/node-packages.json deleted file mode 100644 index f6da8df..0000000 --- a/pkgs/webapps/etherpad-lite/modules/ep_copy_paste_select_all/node-packages.json +++ /dev/null @@ -1 +0,0 @@ -[ "ep_copy_paste_select_all" ] diff --git a/pkgs/webapps/etherpad-lite/modules/ep_copy_paste_select_all/node-packages.nix b/pkgs/webapps/etherpad-lite/modules/ep_copy_paste_select_all/node-packages.nix deleted file mode 100644 index 504bee2..0000000 --- a/pkgs/webapps/etherpad-lite/modules/ep_copy_paste_select_all/node-packages.nix +++ /dev/null @@ -1,26 +0,0 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! - -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: - -let - sources = {}; -in -{ - ep_copy_paste_select_all = nodeEnv.buildNodePackage { - name = "ep_copy_paste_select_all"; - packageName = "ep_copy_paste_select_all"; - version = "0.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/ep_copy_paste_select_all/-/ep_copy_paste_select_all-0.0.4.tgz"; - sha1 = "41b89ece9da8e549a7ca4b11cdfa0a27344f21c8"; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Add support to do Copy, Paste, Select All and Find and Replace, this plugin requires the file menu"; - homepage = https://github.com/ether/ep_copy_paste_select_all; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; -} \ No newline at end of file diff --git a/pkgs/webapps/etherpad-lite/modules/ep_cursortrace/node-packages.json b/pkgs/webapps/etherpad-lite/modules/ep_cursortrace/node-packages.json deleted file mode 100644 index b409581..0000000 --- a/pkgs/webapps/etherpad-lite/modules/ep_cursortrace/node-packages.json +++ /dev/null @@ -1 +0,0 @@ -[ "ep_cursortrace" ] diff --git a/pkgs/webapps/etherpad-lite/modules/ep_cursortrace/node-packages.nix b/pkgs/webapps/etherpad-lite/modules/ep_cursortrace/node-packages.nix deleted file mode 100644 index d8c1480..0000000 --- a/pkgs/webapps/etherpad-lite/modules/ep_cursortrace/node-packages.nix +++ /dev/null @@ -1,26 +0,0 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! - -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: - -let - sources = {}; -in -{ - ep_cursortrace = nodeEnv.buildNodePackage { - name = "ep_cursortrace"; - packageName = "ep_cursortrace"; - version = "2.0.15"; - src = fetchurl { - url = "https://registry.npmjs.org/ep_cursortrace/-/ep_cursortrace-2.0.15.tgz"; - sha1 = "fa374f2d4be2708af998fbb407633c55d9031326"; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Show cursor/caret movements of other users in real time"; - homepage = https://github.com/redhog/ep_cursortrace; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; -} \ No newline at end of file diff --git a/pkgs/webapps/etherpad-lite/modules/ep_delete_empty_pads/node-packages.json b/pkgs/webapps/etherpad-lite/modules/ep_delete_empty_pads/node-packages.json deleted file mode 100644 index 8688afc..0000000 --- a/pkgs/webapps/etherpad-lite/modules/ep_delete_empty_pads/node-packages.json +++ /dev/null @@ -1 +0,0 @@ -[ "ep_delete_empty_pads" ] diff --git a/pkgs/webapps/etherpad-lite/modules/ep_delete_empty_pads/node-packages.nix b/pkgs/webapps/etherpad-lite/modules/ep_delete_empty_pads/node-packages.nix deleted file mode 100644 index 8f3e9c0..0000000 --- a/pkgs/webapps/etherpad-lite/modules/ep_delete_empty_pads/node-packages.nix +++ /dev/null @@ -1,26 +0,0 @@ -# This file has been generated by node2nix 1.8.0. Do not edit! - -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: - -let - sources = {}; -in -{ - ep_delete_empty_pads = nodeEnv.buildNodePackage { - name = "ep_delete_empty_pads"; - packageName = "ep_delete_empty_pads"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/ep_delete_empty_pads/-/ep_delete_empty_pads-0.0.6.tgz"; - sha512 = "ZpVKhWYUBAz5jWXT4Ldjraa5oAmOmOiSaNUSVOdVEG7DLeoNaTrjSQx0KZl4EjF1Qp/oUQwX69ryjY0assmdrw=="; - }; - buildInputs = globalBuildInputs; - meta = { - description = "Delete pads which were never edited"; - license = "Apache-2.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; -} \ No newline at end of file diff --git a/pkgs/webapps/etherpad-lite/modules/ep_embedmedia/fix.patch b/pkgs/webapps/etherpad-lite/modules/ep_embedmedia/fix.patch deleted file mode 100644 index 162f1b0..0000000 --- a/pkgs/webapps/etherpad-lite/modules/ep_embedmedia/fix.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff --git a/ep.json b/ep.json -index 083d484..6803475 100644 ---- a/ep.json -+++ b/ep.json -@@ -5,6 +5,7 @@ - "hooks": { - "eejsBlock_editbarMenuLeft": "ep_embedmedia/hooks:eejsBlock_editbarMenuLeft", - "eejsBlock_scripts": "ep_embedmedia/hooks:eejsBlock_scripts", -+ "eejsBlock_timesliderBody": "ep_embedmedia/hooks:eejsBlock_scripts", - "eejsBlock_styles": "ep_embedmedia/hooks:eejsBlock_styles", - "eejsBlock_body": "ep_embedmedia/hooks:eejsBlock_body" - }, -diff --git a/static/css/main.css b/static/css/main.css -index 72a460f..3b66d8e 100644 ---- a/static/css/main.css -+++ b/static/css/main.css -@@ -6,10 +6,18 @@ - z-index:999999; - } - -+#embedMediaSrc { -+ max-width: 100%; -+} -+ - .embedMediaButton { - padding:10px; - } - -+#doEmbedMedia{ -+ color:blue; -+} -+ - #cancelEmbedMedia{ - color:red; - } -@@ -19,6 +27,6 @@ - } - - .buttonicon-embed-media:before{ -- content:"\e80b"; -+ content:"\e83b"; - top: 2px !important; - } -diff --git a/static/js/main.js b/static/js/main.js -index 8c94767..19415d5 100644 ---- a/static/js/main.js -+++ b/static/js/main.js -@@ -10,22 +10,25 @@ $(document).ready(function () { - } else { - module.slideDown("fast"); - } -+ module.toggleClass("popup-show"); - }); - - $("#doEmbedMedia").click(function () { - var padeditor = require('ep_etherpad-lite/static/js/pad_editor').padeditor; - - $("#embedMediaModal").slideUp("fast"); -+ $("#embedMediaModal").removeClass("popup-show"); - - return padeditor.ace.callWithAce(function (ace) { -- rep = ace.ace_getRep(); -+ var rep = ace.ace_getRep(); - ace.ace_replaceRange(rep.selStart, rep.selEnd, "E"); - ace.ace_performSelectionChange([rep.selStart[0],rep.selStart[1]-1], rep.selStart, false); -- ace.ace_performDocumentApplyAttributesToRange(rep.selStart, rep.selEnd, [["embedMedia", escape($("#embedMediaSrc")[0].value)]]); -+ ace.ace_performDocumentApplyAttributesToRange(rep.selStart, rep.selEnd, [["embedMedia", escape($("#embedMediaSrc")[0].value)]]); - }, "embedMedia"); - }); - - $("#cancelEmbedMedia").click(function () { - $("#embedMediaModal").slideUp("fast"); -+ $("#embedMediaModal").removeClass("popup-show"); - }); - }); -diff --git a/templates/modals.ejs b/templates/modals.ejs -index 9340698..8915a3b 100644 ---- a/templates/modals.ejs -+++ b/templates/modals.ejs -@@ -1,4 +1,4 @@ --