diff --git a/depot/base-list.nix b/depot/base-list.nix deleted file mode 100644 index 56f2856..0000000 --- a/depot/base-list.nix +++ /dev/null @@ -1,62 +0,0 @@ -/* DO NOT EDIT - this file generated by gen-list.sh */ [ -{name="base-fiasco";value={sha256="0w4kgmq3dd0r8vl51v9az9h74l85r3ci47xhhmk85g8ajw9mc33s";version="2019-09-30";};} -{name="base-foc-pc";value={sha256="0qjjfcyqkzd022vxwivinhabfaxbjapq3ksr2jdg5ic4nxf3dd56";version="2019-09-30";};} -{name="base-hw-pc";value={sha256="0z3fypafwc2vv9z330l43fyhvkvn765nf2qxa3xja0ahpnbsgwiv";version="2019-09-30";};} -{name="base-linux";value={sha256="1j5q0c8hsbsk7piz8pz75sy05pilbxv1df96mr3qxwwzv1mmg999";version="2019-09-30";};} -{name="base-okl4";value={sha256="01gl5cs54w9xz3ijaa62w7s0x0mmzffp1517qpv76bjn7vrv57cn";version="2019-09-30";};} -{name="base-pistachio";value={sha256="0wjy2wf21a342y7j95jahzrfv7jpk7apc3vi6ddnpz8mnfw9gs13";version="2019-09-30";};} -{name="base-sel4-x86";value={sha256="0rph0fddq1p9k9pb2zihfgzbbdpw3syfmn47rw4svhm65h95ifsc";version="2019-09-30";};} -{name="test-block";value={sha256="1mqi4vm66v8schz7ai97fz1daqqidlgfk6zc380p64zmlmzw09zb";version="2019-08-27";};} -{name="test-bomb";value={sha256="1zmr2h582542r4dd1bgxvfs2prrxq20ps6xzidwl74dwpjjj3z91";version="2019-08-27";};} -{name="test-clipboard";value={sha256="1239h11griqpmhmwrigqz4snzwaibvjhwv3w8wkv7v84a02z93i5";version="2019-08-27";};} -{name="test-ds_ownership";value={sha256="0146pjzqf5afcjfc9rv4p9n49nln1i1cwqgjg4x26lvrdj7rbrjj";version="2019-08-27";};} -{name="test-dynamic_config";value={sha256="0rkmbq5pg57gx15vm6n6g8zhmlhrrjv3pyhxz0qkcs32cfdfy620";version="2019-08-27";};} -{name="test-fault_detection";value={sha256="1hqp4xb0fyb7z9glq6m40yppgd4pxqf32216jlksvxvz2kkca7nv";version="2019-08-27";};} -{name="test-fs_packet";value={sha256="1vgiq5457hnwjnv36azpprxm2bq0sz0jqq3ip9wmwbs7gby35dn3";version="2019-08-27";};} -{name="test-fs_report";value={sha256="191dck9si0p6r3j48gg9zy2m1n9fh8yh32ygimw3j70ac4jgwksp";version="2019-08-27";};} -{name="test-immutable_rom";value={sha256="1fp5r6w60y7dkqahdpwddbw7afxp4knbi78dqb52vfjpsc45m5ba";version="2019-08-27";};} -{name="test-init";value={sha256="1d963rjqhklm5va3ndjpn31hjvbb173b5l8qzgvbk8m17lwya9pr";version="2019-08-27";};} -{name="test-init_loop";value={sha256="0kz2gvp20hplfihrzrqlsd1y84fh9nbsq6j9d10fv5j6y7zshk70";version="2019-08-27";};} -{name="test-ldso";value={sha256="09554ygjyi7bg9q3i2bl1swjx107an6i9ahncvl7jyhhls3kv5ns";version="2019-08-27";};} -{name="test-libc";value={sha256="1f468n4k1hdqas8dalg5an3ch2slsj5ckdz0lkc3h3666d1z6hwd";version="2019-08-27";};} -{name="test-libc_connect";value={sha256="0imcvilspr6n52zrc1dgprfanfg76y09i7salypqsi5wwqxa2fxj";version="2019-08-27";};} -{name="test-libc_counter";value={sha256="0qlpz385vkxp2gd18vzwzi84vgc6pzywy033l8wy3g4wdkldmpz3";version="2019-08-27";};} -{name="test-libc_getenv";value={sha256="1prl1al5kvhfvpcpdg9pfhmf98z8iw7p2m91p5ykdjv76w040lks";version="2019-08-27";};} -{name="test-libc_pipe";value={sha256="1wn44ysz16kzg6arwh9m81dwfqirsw01gwgp051g0y9vw3xp2j9m";version="2019-08-27";};} -{name="test-libc_vfs";value={sha256="04h4vsxp3gxpz71yy1yckvmqgyab5yn3mn3ywfyz3hjw65g361mw";version="2019-08-27";};} -{name="test-libc_vfs_block";value={sha256="19hbbsr5as1n0ffcqbc555jkabfa4kp9qsp76qpm7awksjyjnk7z";version="2019-08-27";};} -{name="test-log";value={sha256="0nh2i1ra95lrfnb0ak28cflz6pya6v2svdz071kyv9bvfvmwrn3m";version="2019-08-27";};} -{name="test-magic_ring_buffer";value={sha256="0z7lq4p7qchxw0bp7fm8v3b4x6vp5gy9ncj6ibwly0igbbdkks2k";version="2019-08-27";};} -{name="test-mmio";value={sha256="0s4wmla8x13px7qm1jvmfi89jxribfylahjpwyqcdc5p5yn9jzx3";version="2019-08-27";};} -{name="test-netty";value={sha256="1snj3mxyghp158lcxb85s5dr6zxxv8krz6c9cynqhig7gfljgyp1";version="2019-08-27";};} -{name="test-new_delete";value={sha256="0k6n40ywgs0wfhsi7vn7x7z52mpd31gnbyqyxhllrzslh03jxz3v";version="2019-08-27";};} -{name="test-nic_loopback";value={sha256="1hbvwh7r9650iskjhdbbjiir7afpj1rljxv3079xznrr2zbrr4c4";version="2019-08-27";};} -{name="test-pthread";value={sha256="0yv0xc965n266pm464nv4qcg3c9ni5dvg5693gmxwffwq3wsdcrq";version="2019-08-27";};} -{name="test-reconstructible";value={sha256="1r01k9r8zj96cw860rd1vkbnivdr1yql6baczm0wnrwa0rmmrnb9";version="2019-08-27";};} -{name="test-registry";value={sha256="1zgw7w34ai9isnqqj4wks8ch9b65m7gj95l6vxcngkc6vr7x7bjr";version="2019-08-27";};} -{name="test-report_rom";value={sha256="05qhxzdj9gxy61jmrvl196g5x4wzk3shk7i1k2yfpsf4slcji4n5";version="2019-08-27";};} -{name="test-resource_request";value={sha256="0rcbic1rfv4p7jp343yl3ws9f6rm409dzjd6nyk95x5lyn3cnhh2";version="2019-08-27";};} -{name="test-resource_yield";value={sha256="1ad4v54spmwz2gl0f620g26mm1al0dli4x671nnl7cc30adfv3qx";version="2019-08-27";};} -{name="test-rm_fault";value={sha256="0pxj0md4wb1v9kxbicbdfqdavprkj88c4v79x2x5vlpg5s4ms7c6";version="2019-08-27";};} -{name="test-rm_nested";value={sha256="0npjhabzq9x248q048rgakakhvvchykmbg012xnwf4vx7rzql8n1";version="2019-08-27";};} -{name="test-rom_block";value={sha256="0p4m5bp6xwkg78l2xm1ak3vay9fzk1f274xz68hj17gwhj9sc1gs";version="2019-08-27";};} -{name="test-rtc";value={sha256="0lrfwjgk22xnnk5sb90f2pmw5y1sfm9jj1db3qndfa552nw80dh5";version="2019-08-27";};} -{name="test-sanitizer";value={sha256="051hafrgi61l4f67l2vg7blmc711r7vbppvp8kg5jv8wzxxrxsrp";version="2019-08-27";};} -{name="test-segfault";value={sha256="06pf1k37qbgm1rzaqx12sgi368r4nc5yifvw3yhqijzsmdadrsi3";version="2019-08-27";};} -{name="test-signal";value={sha256="177w367lnls387k20p8k20va4vagpz9xhqw4hc6hj0615fxqz8qr";version="2019-08-27";};} -{name="test-slab";value={sha256="0gvg2lgy9nrwg5s9j5k8di90qw1jkcrkhjjdfgbycl3wn5zkc1m7";version="2019-08-27";};} -{name="test-solo5";value={sha256="1v4bh098wjvwcsgjwq1g3b9hgpswm90lsjh4q9ldk9ggr53c1ijk";version="2019-08-27";};} -{name="test-stack_smash";value={sha256="1n1r2a4q134lm60ls52sdhq2mqz5ykv849172x05vzfav3f2qi30";version="2019-08-27";};} -{name="test-stdcxx";value={sha256="11hr7nirz6fiwmziqpp2spxranbqf0riz228ryqhcbd1caag5if4";version="2019-08-27";};} -{name="test-synced_interface";value={sha256="0igb0fj2yg2hc01didfi18n8barvk8bvh28f8i2xa6pym77gkqbb";version="2019-08-27";};} -{name="test-tcp";value={sha256="107d58vqrc65nyjclg00fgd2bfgmviy5zxd3bjx3y82hiwgn4kwi";version="2019-08-27";};} -{name="test-timed_semaphore";value={sha256="0gv7s1q1l3068i571cjfrq7kmc1ar291xkamjnnn94hdsjhr36rb";version="2019-08-27";};} -{name="test-timer";value={sha256="1bjdddkvrbqk5caqg8qdg0xmq7byc361xg5zmfxdkhihja08ahcm";version="2019-08-27";};} -{name="test-trace";value={sha256="124xr442vh4b1jh523ayai2zcd96mmh947ii2yssnq738hl2qfbq";version="2019-08-27";};} -{name="test-trace_logger";value={sha256="1i89l58hrf9girdnln9vc3rzxqip8xjxzqfdmrwcy74pccxzg2vc";version="2019-08-27";};} -{name="test-utf8";value={sha256="0s98wq77322sq1rfrsc7fphzwkfkgykv5i2fvw5d13kxqyxq1zsl";version="2019-08-27";};} -{name="test-vfs_stress";value={sha256="071mc52fvmm2qzhrcs55f59y96xz15l360vrigxypq461h3hr3av";version="2019-08-27";};} -{name="test-weak_ptr";value={sha256="0kxi0pnzqm6g6bf6rarzczkixhmclvfwk82jlw22m085mwhi198g";version="2019-08-27";};} -{name="test-xml_generator";value={sha256="0g7gy0csmm5v0x2zifmxcw2b2pfzr1gyxg4z68ghpwkz4ynm9jn7";version="2019-08-27";};} -{name="test-xml_node";value={sha256="1g44v399v03szds5w6sxi0ywy50g30rfgr1cy5pgx7vnyakdwnds";version="2019-08-27";};} -] diff --git a/depot/default.nix b/depot/default.nix deleted file mode 100644 index d1a8eb5..0000000 --- a/depot/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -# SPDX-FileCopyrightText: Emery Hemingway -# -# SPDX-License-Identifier: LicenseRef-Hippocratic-1.1 - -{ stdenvNoCC, fetchurl }: - -let - stdenv = stdenvNoCC; - unpack = baseUrl: { name, value }: { - inherit name; - value = stdenv.mkDerivation { - pname = name; - inherit (value) version; - preferLocalBuild = true; - src = fetchurl { - url = - "${baseUrl}${name}/${value.version}.tar.xz"; - inherit (value) sha256; - }; - phases = [ "unpackPhase" "installPhase" "fixupPhase" "distPhase" ]; - installPhase = '' - find . -type f | while read FILE; do - case $FILE in - *.a | *.o) install -Dm444 -t $out/lib $FILE;; - *.so) install -Dm555 -t $out/lib $FILE;; - *.tar) install -Dm444 -t $out/tar $FILE;; - *) install -Dm555 -t $out/bin $FILE;; - esac - done - ''; - meta = { - license = [ "LicenseRef-Genode" ]; - downloadPage = "${baseUrl}${name}/"; - }; - }; - }; - - expand = baseUrl: listing: builtins.listToAttrs (map (unpack baseUrl) listing); - - base = expand "http://depot.hq.c3d2.de/user/bin/x86_64/" (import ./base-list.nix); - genodelabs = expand "http://depot.genode.org/genodelabs/bin/x86_64/" (import ./genodelabs-list.nix); - -in (base // genodelabs) diff --git a/depot/gen-list.sh b/depot/gen-list.sh deleted file mode 100755 index cb32380..0000000 --- a/depot/gen-list.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -# TODO: git clone shallow, fhs environment, make -f depot/whatever - -echo "/* DO NOT EDIT - this file generated by gen-list.sh */ [" - -find ../../genode/public/genodelabs/bin -name '*.tar.xz' -print \ - | sort \ - | awk --field-separator / '{print $8" "$9" "$0}' \ - | while read NAME VERSION LOCAL -do - TAR_PATH=`realpath $LOCAL` - SHA256=`nix-prefetch-url file://$TAR_PATH` - echo "{name=\"$NAME\";value={sha256=\"$SHA256\";version=\"${VERSION%%.tar.xz}\";};}" -done - -echo ']' diff --git a/depot/genodelabs-list.nix b/depot/genodelabs-list.nix deleted file mode 100644 index 98df69b..0000000 --- a/depot/genodelabs-list.nix +++ /dev/null @@ -1,94 +0,0 @@ -/* DO NOT EDIT - this file generated by gen-list.sh */ [ -{name="acpi_drv";value={sha256="0l8b5w3rv5fvx60qjp6mfjrdn3c37rinqadqksrqv46ix7sm5g7r";version="2019-08-27";};} -{name="acpica";value={sha256="19g0i2cixvn4smwykmr27a763njcyccjl1fh81pcqdygdqni56bp";version="2019-08-27";};} -{name="ahci_drv";value={sha256="1a7kb2ppf3ww2n65piinc0nrr8nkpdld2jv9iqn4ag2cj4g212qf";version="2019-08-27";};} -{name="backdrop";value={sha256="0jy9qwmjfy1zra9hd829fhnkp933yv798pzihqlhfbyf3zcf4m01";version="2019-08-27";};} -{name="base-nova";value={sha256="12249m7awh2hn9cwa4ck19cxgk6cv7m2bz996hs366lm70j69w9b";version="2019-08-27";};} -{name="bash-minimal";value={sha256="08rpnsvywrp2a7a464xza7mi89sw81qfrxr626phc5hfviiyjp5j";version="2019-08-27";};} -{name="boot_fb_drv";value={sha256="1dclzwl4m103vlzdr59yx22mq7y7cpm2yw0n3whbp4v1f237cm2r";version="2019-08-27";};} -{name="cached_fs_rom";value={sha256="0qxhvap6qsi8s34l0f1xkr8kkfllpjbxr53m289b8j5m3f902mhv";version="2019-08-27";};} -{name="chroot";value={sha256="1x0xzlsjvcrpj59kn487aa1hf892bwyy5ck25d2wd4j0nsin3rjd";version="2019-08-27";};} -{name="clipboard";value={sha256="1xrb1g5fqxxg3k6mw0h2s7xidma8vcdp0g89yzzplmcc2cyn278v";version="2019-08-27";};} -{name="coreutils-minimal";value={sha256="1hb385gnn1m5phjvfs5nkfkh8xn59k7gjw9ivh35czixkh2rp658";version="2019-08-27";};} -{name="coreutils";value={sha256="002lvh16kxgb41acksjrl0phsm8idaby0z7jcmddzpybgdjj60dx";version="2019-08-27";};} -{name="curl";value={sha256="0zavxvkw5cibk9pdjdahb6ywyniz2nhqxdw6f98vnhf623kp23kz";version="2019-08-27";};} -{name="decorator";value={sha256="057wf5i3vkq4l8s400zg0zs1qjf1mj29585b4fjjk23ml3kpr89j";version="2019-08-27";};} -{name="depot_download_manager";value={sha256="0mfgy76jzq2h8fff4y1lxia4bgxd63cabcwg15pqhcwlbc7bdww0";version="2019-08-27";};} -{name="depot_query";value={sha256="0kzmfkyia4qj2xi2cdja6661r9wqm6g884p7rbv75zm2v3hyv6lz";version="2019-08-27";};} -{name="driver_manager";value={sha256="0fy6ml64pj1nllqwlhwncyiwybsk2l0mwy1nc0q7xsf6k95szk1f";version="2019-08-27";};} -{name="e2fsprogs-minimal";value={sha256="1dlvvbn53klzz4aj34l8bw2x823ih7m7593g8dmm0hsw3yv4y71p";version="2019-08-27";};} -{name="expat";value={sha256="0qpiwv2klcgq61prrn7h5kwms4cmk0bqjcpkkpml2zrz17yzyg1p";version="2019-08-27";};} -{name="extract";value={sha256="0s4y0y4nkx90p5msgwjj3ap293ll5x4cva6s1cbasia13lk9r6nm";version="2019-08-27";};} -{name="fetchurl";value={sha256="0a53cq27g98zfdvc87brzrdwv58p656da9jyhqpjb24azkbdb1l5";version="2019-08-27";};} -{name="file_terminal";value={sha256="1k7752s7sps2xij3avzyjqxn2wqyrjjf59x9af1aq22xagivw4l8";version="2019-08-27";};} -{name="freetype";value={sha256="1851hladn19lps5fp2g31cps7620wi94cpz7c70baqw7n4j71xhc";version="2019-08-27";};} -{name="fs_query";value={sha256="185icsck6r5ax7rkbbr5r6wczy33kwigdch189al07b4dajddxk1";version="2019-08-27";};} -{name="fs_report";value={sha256="0mdxmhk5mw2q6gb46zxsdsw9zps5lpmqkmj5fmr3b9wa3mjlw2vq";version="2019-08-27";};} -{name="fs_rom";value={sha256="1lp2ssjbb0hbjymlr17xbpy2mncpi31hbf50ijn689hkbjggrv58";version="2019-08-27";};} -{name="fs_tool";value={sha256="1n9kn05sgwxbkdqb6h8s5g7dd4ph7kwgv3rv3p4l9aigr3ag4j4d";version="2019-08-27";};} -{name="global_keys_handler";value={sha256="14axqgqcivqxn5kxg1x6i463fbkan12j81q4hw4lmgs6wwrk0d73";version="2019-08-27";};} -{name="gpt_write";value={sha256="159fr0vr6zb28kj8asa0nhbmm4znw9jrz9vhi34qpwgjn3b2925y";version="2019-08-27";};} -{name="init";value={sha256="15z9fscqh91mapc28bpfbsh1dxb8k0vcq75x6f7v2hs11jb8r6xf";version="2019-08-27";};} -{name="input_filter";value={sha256="1jsrh3dydr1zs0g77xir9aw11icxj2f85yhdpbxvx15sa43907kh";version="2019-08-27";};} -{name="intel_fb_drv";value={sha256="04n1mq56fzlpjwrqiawzw1530qjd3q6r7nk2h8j4kyyks78js88b";version="2019-08-27";};} -{name="ipxe_nic_drv";value={sha256="0ai1yl2iz9j0lhxhi0lxc0qv9r1q9pyn1rkyb6l05ijxvwbcqma6";version="2019-08-27";};} -{name="jpeg";value={sha256="0261wahfx24gjfj5a34ggzqka4nzgnc19l9arypf4b2p1vmd4gwa";version="2019-08-27";};} -{name="libarchive";value={sha256="17jzm3rnmjxzbyxcjz4lczng1z7643dks95yvggsc3vqrx1g3hmr";version="2019-08-27";};} -{name="libc";value={sha256="0f2rcjsfb79zgs0v34w4qnf85i7d2p61p9wy2i0k9hq3d1yqb3fl";version="2019-08-27";};} -{name="libcrypto";value={sha256="1yya3pxbzg7m1zrip3vh5m44vx38ckmb5hqcs61dxqid71py7r6b";version="2019-08-27";};} -{name="libiconv";value={sha256="0kkc76vkv0hdgid6ygrfl88c957q21v2zpbvqqz0pjrmxwi98kly";version="2019-08-27";};} -{name="liblzma";value={sha256="1sqwlf1cnlssai2xka937gkz1rihxsk40260vqk55n9xd5arpjhg";version="2019-08-27";};} -{name="libpng";value={sha256="1y18g1ypdjiw43shcrjpvi0mn9055nnjmsnanaqxwvhfpi787aj6";version="2019-08-27";};} -{name="libssh";value={sha256="1z55zb52i866qjwl9rshhl2zfilq8g3rjpnxhh397racq18ay16s";version="2019-08-27";};} -{name="libssl";value={sha256="0kafqbpzvx9hvdcq91ksqw5s6ynyzf9c2kq2186sgwqdy8kgkq9r";version="2019-08-27";};} -{name="log_core";value={sha256="1d3in4a9y7c3flig8gkaqsd809j2p60fh8nmz4m675q1s4mvfrp2";version="2019-08-27";};} -{name="menu_view";value={sha256="105pdrs3ipdf2xh3413axkikwj0lqirlgrdragrf7abfx6h44qvz";version="2019-08-27";};} -{name="mesa";value={sha256="1sa9wlwbsldjvynh13i75c9np7rm914h3nksw710apm3js3yjkcg";version="2019-08-27";};} -{name="nano3d";value={sha256="0p0rkx49816d8n4jwnnpj09ndvjrixj36kk64m4x6j0f90icqj2v";version="2019-08-27";};} -{name="ncurses";value={sha256="0x912bf63iz28bjj4j9hz0ppvc365x5zg574g1ghi4xgcrm6rr0m";version="2019-08-27";};} -{name="nic_router";value={sha256="0y136w6y8y0vrmzi5nakvphxd3x1zmr8g4jxadj4s0s525rm3qgy";version="2019-08-27";};} -{name="nit_fader";value={sha256="078k0gilfx839h3lg24960ff4fmk6a0hi5832p249pb4if8dcfwr";version="2019-08-27";};} -{name="nit_fb";value={sha256="1c3xqyqppqwygfhnbvpgsy5j2dir1k7sdfb9s9ld5j0psav742iy";version="2019-08-27";};} -{name="nit_focus";value={sha256="109kzplshlday4z89an0pfpkaf42mxb7fj5ql2dbvmc8zb276185";version="2019-08-27";};} -{name="nitpicker";value={sha256="0by1hmkdihq9q8i24z5vwiav7fl26csg06vixzzk79936ll4lns8";version="2019-08-27";};} -{name="noux";value={sha256="1i9bxy7rmcn3hvl4n8wx9d2cla3xld4jqwawhs10iv0iv6c3apb1";version="2019-08-27";};} -{name="nvme_drv";value={sha256="1g3d6410jczx1kfdq5lzsak8dcg3j8sq36qi9f3fjas52sbw37yg";version="2019-08-27";};} -{name="part_block";value={sha256="0vr2giixh564xc34wc3n0233k59y3360p8vwnm6788yxlayd3c88";version="2019-08-27";};} -{name="platform_drv";value={sha256="0p4dmx0y79k65nfz22nnbk6dyylgx2cv3j5vzl90xp4vp5mmvz3z";version="2019-08-27";};} -{name="posix";value={sha256="1z08w7lwgq49crbjrim2dh5wi80czfxawwcq7cxbjbfap5nw8ak6";version="2019-08-27";};} -{name="ps2_drv";value={sha256="1ac7645g0jhppyanp54jlpyvcwb32i8jwcgwy6kr1mqb7ixd3dm6";version="2019-08-27";};} -{name="qt5_component";value={sha256="1jbr0fqai7mvwvdxmhngbbnya4ziwxkrnl0amv13k1nrxsgha4jg";version="2019-08-27";};} -{name="qt5_core";value={sha256="0abg9h99jkis9f57zcfq4mw97bwrczqichmnvg9kfwqy17limrgg";version="2019-08-28";};} -{name="qt5_gui";value={sha256="01g5qphkqn6a2rlcc5dmvrd1q7dvj2crbhasidjfpsiklb88736j";version="2019-08-28";};} -{name="qt5_printsupport";value={sha256="0rfvvafv2lh65hx17k6hn1kfrhsddzjrq0nhb2xc2q1nvr3wnpli";version="2019-08-28";};} -{name="qt5_qjpeg";value={sha256="1j2153rkf47qs7i9nkyg4dsr84yf8bdw66hi2nm8w7kvz8m5a6dd";version="2019-08-28";};} -{name="qt5_qpa_nitpicker";value={sha256="1svfmw768hxx1hpxvslazcs0czqv7ib88n5yb8cxalqdrmhaa3s6";version="2019-08-28";};} -{name="qt5_textedit";value={sha256="0lag3s9xkncy7s2vr5x2j4f0rnr7xylfc1f9281s34xk7vcyrv9i";version="2019-08-28";};} -{name="qt5_widgets";value={sha256="04xn5lrbskvw5lslfhqj46j5ihb6y1kw5p8br1dcsgc517nxvjdi";version="2019-08-28";};} -{name="ram_fs";value={sha256="1h55y7i74h1h6mixzd14pc81v41lyq2r7ay1ca9d2vc0s4dc4vad";version="2019-08-27";};} -{name="report_rom";value={sha256="1fc2qg8lfiznysn47m22c90v2z2kc6cdpnd8ny4j22rwmc5ya03l";version="2019-08-27";};} -{name="rom_filter";value={sha256="1s2xnklvwrmpfmynl44k5m0w3mwnhplxsfcgw8k2cap4vkh8vchr";version="2019-08-27";};} -{name="rom_reporter";value={sha256="1zvmi5mxcj2xxzj3ipsr3xh9qf43xplymcmmjjbapnswwhnqc9a8";version="2019-08-27";};} -{name="rtc_drv";value={sha256="0cbh616z5k3dgkb51xm3966vk66sr80jd6gxh324515rxhxk7rip";version="2019-08-27";};} -{name="rump";value={sha256="0165jz7c7dbs47bci1y7pn6qv6jv4h251h3mm41vkn97c31aryxx";version="2019-08-27";};} -{name="sculpt_manager";value={sha256="0fkydzdhb195wg8na8hfzy66rx0hd68g2cgp7hkm65lgcphg7l68";version="2019-08-27";};} -{name="stdcxx";value={sha256="0ahbj80kwblp0ll7gwn05krmfx0hgbmfjy9g1991d0ppabw52d8w";version="2019-08-27";};} -{name="terminal";value={sha256="1yw7gn22fyw65dn481rx1lph0bawrdcj72mr4kddjdf4hajk7n75";version="2019-08-27";};} -{name="terminal_log";value={sha256="1vmzflxca46n4bv14qybqq8v1mn2rsplvf69izvymx768gczhwq5";version="2019-08-27";};} -{name="themed_decorator";value={sha256="1vcvjfx5h94kzrvrfi3ybyl146f1c954xcf2m8yx7y1h7pvlady3";version="2019-08-27";};} -{name="usb_block_drv";value={sha256="1ldxdshb1gl5204grcinliyk821xgvfm0yawfcvh9yv49q526ksn";version="2019-08-27";};} -{name="usb_drv";value={sha256="0ljs7sb82w7am48mm48jgzq7mj3mi5hvj22j4y85bq3c22miq0kf";version="2019-08-27";};} -{name="vbox5-nova";value={sha256="00215vwxyc77q8s4kh7v1fn1cs120wm1l6dqd1jm4dxq6pq3fqfv";version="2019-08-27";};} -{name="verify";value={sha256="1s1ljsky8xm6gmmbsy1wspqra02jgsvbh2n5xz88c9r7s94zq6xa";version="2019-08-27";};} -{name="vesa_drv";value={sha256="14gw55byyasz2i0b871hpdp8vjizhhkd6p7dlrg4036qji3pbvd9";version="2019-08-27";};} -{name="vfs";value={sha256="0jqgj9zq10zy9gq2lzkprbq8pdy3v90jb61di09fdrsmc1y76pi1";version="2019-08-27";};} -{name="vfs_import";value={sha256="1d9mrjcs0iq0nb4dzwh6dw2iwqx25450c16ca3a5pg31k6w59fqn";version="2019-08-27";};} -{name="vfs_jitterentropy";value={sha256="1m9flx0n21wgkfqbvrghpn53rf4cfsziv848zawr9jk6ygns5rn1";version="2019-08-27";};} -{name="vfs_lxip";value={sha256="1ld2hqizs0hpy9bbfamkg52bbicdhi5a6v2b17c512yrdidb7hbg";version="2019-08-27";};} -{name="vfs_ttf";value={sha256="10ypnhk1r8yavmagpv3ylbyz3gw2nrgrplfabnap2nmavai03dff";version="2019-08-27";};} -{name="vim-minimal";value={sha256="18cj7dirg3kplj6277gajfbiv7in28dfxx7dxwzwlkhcppnm9v3y";version="2019-08-27";};} -{name="wifi_drv";value={sha256="1fmwwrp0w7iinn70h09imlmxqnd5x9kn6fagmj3ria6mqai8za8s";version="2019-08-27";};} -{name="window_layouter";value={sha256="0fbr5wfpbabzi1h1bwa9558m05hcgnwa5van9rxbzp934krmwch7";version="2019-08-27";};} -{name="wm";value={sha256="0y2v0frxhpkvw8mzn71xn8z4pap459r0bk8w14dnrw61fv8rxjkh";version="2019-08-27";};} -{name="zlib";value={sha256="160y5hl49hhjqy3132f0k8xi7c3x5yz4h29dsjrfb8sl1ccmsaca";version="2019-08-27";};} -] diff --git a/flake.lock b/flake.lock index c4bfe37..b6a0a67 100644 --- a/flake.lock +++ b/flake.lock @@ -5,25 +5,38 @@ "nixpkgs": { "inputs": {}, "narHash": "sha256-wJg4DA700SoQbEz61448sR6BgxRa1R92K3vvCV1g+HY=", - "originalUri": "git+https://github.com/nixos/nixpkgs.git?ref=18.09-beta&rev=1d4de0d552ae9aa66a5b8dee5fb0650a4372d148", - "uri": "git+https://github.com/nixos/nixpkgs.git?ref=18.09-beta&rev=1d4de0d552ae9aa66a5b8dee5fb0650a4372d148" + "originalUrl": "git+https://github.com/nixos/nixpkgs.git?ref=18.09-beta&rev=1d4de0d552ae9aa66a5b8dee5fb0650a4372d148", + "url": "git+https://github.com/nixos/nixpkgs.git?ref=18.09-beta&rev=1d4de0d552ae9aa66a5b8dee5fb0650a4372d148" }, "nixpkgsStaticLinux": { "inputs": {}, "narHash": "sha256-famU3pJZ4vkElV9qc71HmyRVSvcrAhfMZ0UJKpmmKP8=", - "originalUri": "git+https://github.com/nh2/nixpkgs.git?ref=static-haskell-nix-stack-dhall-working", - "uri": "git+https://github.com/nh2/nixpkgs.git?ref=static-haskell-nix-stack-dhall-working&rev=925aac04f4ca58aceb83beef18cb7dae0715421b" + "originalUrl": "git+https://github.com/nh2/nixpkgs.git?ref=static-haskell-nix-stack-dhall-working", + "url": "git+https://github.com/nh2/nixpkgs.git?ref=static-haskell-nix-stack-dhall-working&rev=925aac04f4ca58aceb83beef18cb7dae0715421b" } }, "narHash": "sha256-NGbS2bymVuCQcanlBO41I6ZjSAZSLXhACK3qQU25zUs=", - "originalUri": "git+https://github.com/dhall-lang/dhall-haskell?ref=flake", - "uri": "git+https://github.com/dhall-lang/dhall-haskell?ref=flake&rev=256810cd5adf1ae5862eed0ffdaab4cf49f6fe67" + "originalUrl": "git+https://github.com/dhall-lang/dhall-haskell?ref=flake", + "url": "git+https://github.com/dhall-lang/dhall-haskell?ref=flake&rev=256810cd5adf1ae5862eed0ffdaab4cf49f6fe67" + }, + "genode-depot": { + "inputs": { + "nixpkgs": { + "inputs": {}, + "narHash": "sha256-Y5ZOTgInrYYoas3vM8uTPLA2DvFI9YoI6haftIKl9go=", + "originalUrl": "nixpkgs", + "url": "github:edolstra/nixpkgs/015c9ec3372e328ea6742b409a1e9aa26dab2b31" + } + }, + "narHash": "sha256-bCKZSw8cBTJf5EPSXzuKPTaM8EAFXez27BCMZn+rUk0=", + "originalUrl": "genode-depot", + "url": "git+file:///home/repo/genode-depot?ref=master&rev=b9119fccb3114829900ae75886d3b5edb54bbd7f" }, "nixpkgs": { "inputs": {}, "narHash": "sha256-1pvSqpPbcREIGI7BF6A29b81bH/dZvywTPwYhrMaRa0=", - "originalUri": "git+https://gitea.c3d2.de/ehmry/nixpkgs.git", - "uri": "git+https://gitea.c3d2.de/ehmry/nixpkgs.git?ref=master&rev=ff59349d99ff0ff2496e85278c596df3a14ef3ec" + "originalUrl": "git+https://gitea.c3d2.de/ehmry/nixpkgs.git", + "url": "git+https://gitea.c3d2.de/ehmry/nixpkgs.git?ref=master&rev=ff59349d99ff0ff2496e85278c596df3a14ef3ec" } }, "version": 3 diff --git a/flake.nix b/flake.nix index 04cd9a9..5a35770 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,7 @@ "git+https://github.com/dhall-lang/dhall-haskell?ref=flake"; }; - outputs = { self, nixpkgs, dhall-haskell }: + outputs = { self, nixpkgs, dhall-haskell, genode-depot }: let nixpkgs' = import nixpkgs; systems = [ "x86_64-genode" ]; @@ -18,7 +18,7 @@ in { - lib = import ./lib { genodepkgs = self; inherit nixpkgs dhall-haskell; }; + lib = import ./lib { genodepkgs = self; inherit nixpkgs dhall-haskell genode-depot; }; packages = forAllSystems (system: import ./packages.nix { @@ -28,7 +28,7 @@ checks = forAllSystems (system: import ./tests { - inherit self nixpkgs dhall-haskell; + inherit self nixpkgs dhall-haskell genode-depot; genodepkgs = builtins.getAttr system self.packages; }); }; diff --git a/lib/default.nix b/lib/default.nix index bba52b8..16708f7 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -1,12 +1,12 @@ -{ genodepkgs, nixpkgs, dhall-haskell }: +{ genodepkgs, nixpkgs, dhall-haskell, genode-depot }: let hostPkgs = import nixpkgs { system = "x86_64-linux"; overlays = [ (self: super: { inherit (dhall-haskell.packages) dhall; }) ]; }; - depot = hostPkgs.callPackage ../depot { }; testPkgs = genodepkgs.packages.x86_64-genode; + depot = genode-depot.packages.x86_64-genode; in { dhallText = name: source: diff --git a/tests/default.nix b/tests/default.nix index cb2a114..21645c8 100644 --- a/tests/default.nix +++ b/tests/default.nix @@ -11,14 +11,14 @@ let # solo5 = call ./solo5 { }; }; -in { self, genodepkgs, nixpkgs, dhall-haskell }: +in { self, genodepkgs, nixpkgs, dhall-haskell, genode-depot }: let hostPkgs = import nixpkgs { system = "x86_64-linux"; overlays = [ (self: super: { inherit (dhall-haskell.packages) dhall; }) ]; }; - depot = hostPkgs.callPackage ../depot { }; + depot = genode-depot.packages.x86_64-genode; testPkgs = genodepkgs; lib = hostPkgs.lib // self.lib;