diff --git a/build.sh b/build.sh index 4b368c97187ed74906a8a9881c485eea0cbbd133..508c98f67b46d12ac4cd77808c63df41d6647455 100755 --- a/build.sh +++ b/build.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -nix-build -A nrm --option extra-substituters http://129.114.24.212/store --option trusted-public-keys example-nix-cache-1:HSwzbJmGDidTrax3Lvx1vMSvto04VN2O5cjfXAG9uz0= +nix-build -A nrm --option extra-substituters http://129.114.24.212/serve --option trusted-public-keys example-nix-cache-1:HSwzbJmGDidTrax3Lvx1vMSvto04VN2O5cjfXAG9uz0= diff --git a/dev/default.nix b/dev/default.nix index f9a53d168411a7e569ba63f63a31663ad0040480..6fd22b85baeea36e95f3d38d1a572afbac389860 100644 --- a/dev/default.nix +++ b/dev/default.nix @@ -68,14 +68,14 @@ pkgs // rec { libnrm = pkgs.callPackage ./pkgs/libnrm { inherit resources; - src = src + "../libnrm"; + src = src + "/libnrm"; hsnrm = haskellPackages.nrmbin; }; pynrm = pkgs.callPackage ./pkgs/pynrm { inherit resources; pythonPackages = python37Packages; - src = src + "../pynrm"; + src = src + "/pynrm"; hsnrm = haskellPackages.nrmbin; }; @@ -115,9 +115,16 @@ pkgs // rec { libnrm-hack = libnrm.overrideAttrs (o: { buildInputs = o.buildInputs ++ [ pkgs.clang-tools ]; }); - jupyterWithBatteries = pkgs.jupyter.override rec { - python3 = python37Packages.python.withPackages - (ps: with ps; [ nb_black msgpack warlock pyzmq pandas seaborn ]); + jupyterWithBatteries = (pkgs.jupyter.override rec { + python3 = (python37Packages.python.withPackages (ps: + with ps; [ + nb_black + msgpack + warlock + pyzmq + pandas + seaborn + ])); definitions = { # This is the Python kernel we have defined above. python3 = { @@ -134,7 +141,7 @@ pkgs // rec { logo64 = "${python3.sitePackages}/ipykernel/resources/logo-64x64.png"; }; }; - }; + }).overrideAttrs (_: { doCheck = false; }); hack = let src' = src; @@ -147,11 +154,13 @@ pkgs // rec { NIXFILE_LIB = (haskellPackages.haskellSrc2nix { name = "hsnrm"; src = patchedSrc (src + "/hsnrm") cabalFileLib; + extraCabal2nixOptions = "--extra-arguments src"; }); NIXFILE_BIN = (haskellPackages.haskellSrc2nix { name = "hsnrm"; src = patchedSrc (src + "/hsnrm") cabalFileBin; + extraCabal2nixOptions = "--extra-arguments src"; }); inputsFrom = with pkgs; [ pynrm-hack hsnrm-hack libnrm-hack ]; buildInputs = [ @@ -187,6 +196,8 @@ pkgs // rec { cp $NIXFILE_LIB/default.nix dev/pkgs/hnrm/lib.nix cp $NIXFILE_BIN/default.nix dev/pkgs/hnrm/bin.nix chmod +rw hsnrm/hsnrm.cabal dev/pkgs/hnrm/bin.nix dev/pkgs/hnrm/lib.nix dev/pkgs/hnrm/bin.cabal dev/pkgs/hnrm/lib.cabal + sed -i 's/src = .*/inherit src;/' dev/pkgs/hnrm/lib.nix + sed -i 's/src = .*/inherit src;/' dev/pkgs/hnrm/bin.nix ''; LC_ALL = "en_US.UTF-8"; LOCALE_ARCHIVE = "${pkgs.glibcLocales}/lib/locale/locale-archive"; diff --git a/dev/haskell-overlay.nix b/dev/haskell-overlay.nix index 4de718cb091244ff9460abcd0b83508c8127bec4..99e006566b4a7401f44ef238ba74fa94362c0131 100644 --- a/dev/haskell-overlay.nix +++ b/dev/haskell-overlay.nix @@ -9,14 +9,17 @@ let regex = doJailbreak super.regex; json-schema = unbreak (doJailbreak super.json-schema); zeromq4-conduit = unbreak (dontCheck super.zeromq4-conduit); - nrmlib = (self.callPackage (./pkgs/hnrm/lib.nix) { }).overrideAttrs (o: { + nrmlib = (self.callPackage (./pkgs/hnrm/lib.nix) { src = src + "/hsnrm"; + }).overrideAttrs (o: { + configurePhase = '' cp ${./pkgs/hnrm/lib.cabal} hsnrm.cabal '' + o.configurePhase; }); - nrmbin = (self.callPackage (./pkgs/hnrm/bin.nix) { }).overrideAttrs (o: { + nrmbin = (self.callPackage (./pkgs/hnrm/bin.nix) { src = src + "/hsnrm"; + }).overrideAttrs (o: { configurePhase = '' cp ${./pkgs/hnrm/bin.cabal} hsnrm.cabal '' + o.configurePhase; diff --git a/dev/pkgs/hnrm/bin.nix b/dev/pkgs/hnrm/bin.nix index 9a25a9afbc2aaaa03fa65e66d3eb31bf9e8864bb..27bfaa66334d2dc39296ac62f19718168370bc71 100644 --- a/dev/pkgs/hnrm/bin.nix +++ b/dev/pkgs/hnrm/bin.nix @@ -1,10 +1,10 @@ { mkDerivation, base, enclosed-exceptions, glpk, nrmlib, protolude -, stdenv +, src, stdenv }: mkDerivation { pname = "hsnrm"; version = "1.0.0"; - src = /nix/store/55xqhvgkgqx63plzl71qlf7cly3kl2lb-patchedSrc; + inherit src; isLibrary = false; isExecutable = true; executableHaskellDepends = [ diff --git a/dev/pkgs/hnrm/lib.nix b/dev/pkgs/hnrm/lib.nix index b58d30e43965ce4b7df49870d357c676e14a1285..d4fda9854b1e954448654e00b900f78c81188c3f 100644 --- a/dev/pkgs/hnrm/lib.nix +++ b/dev/pkgs/hnrm/lib.nix @@ -6,7 +6,7 @@ , hxt-xpath, intervals, json-schema, lens, MonadRandom, mtl , mtl-compat, neat-interpolation, optparse-applicative , pretty-simple, prettyprinter, protolude, random -, recursion-schemes, refined, regex, resourcet, stdenv +, recursion-schemes, refined, regex, resourcet, src, stdenv , storable-endian, template-haskell, text, transformers , typed-process, units, units-defs, unix, unordered-containers , uuid, vcs-revision, vector, yaml, zeromq4-conduit @@ -15,7 +15,7 @@ mkDerivation { pname = "nrmlib"; version = "1.0.0"; - src = /nix/store/zw0kd2hnmhfghd44jqxqmhhka31jfqvs-patchedSrc; + inherit src; libraryHaskellDepends = [ aeson aeson-extra aeson-pretty async base binary brick bytestring conduit conduit-extra containers data-default data-msgpack dhall diff --git a/dev/python-overlay.nix b/dev/python-overlay.nix index d3796098df073cf43fe434958a77fe8ffc458a0f..b89891472a5e5fd056dab5955b47dc5f75010e8b 100644 --- a/dev/python-overlay.nix +++ b/dev/python-overlay.nix @@ -6,6 +6,12 @@ let noCheckAll = pkgs.lib.mapAttrs (name: p: noCheck p); packageOverrides = pself: psuper: noCheckAll { + jupyter_client = psuper.jupyter_client; + nbformat = psuper.nbformat; + ipykernel = psuper.ipykernel; + jupyter_core = psuper.jupyter_core; + networkx = psuper.networkx; + nbconvert = psuper.nbconvert; importlab = pself.callPackage (src + "/dev/pkgs/importlab") { }; pyzmq = psuper.pyzmq.override { zeromq = pkgs.zeromq; }; pytype = pself.callPackage (src + "/dev/pkgs/pytype") { diff --git a/hydra.nix b/hydra.nix index 473646410f9dd93cb024a056ec6997f1f646572c..147bb6caf0eb44f3c595d2f40a0ca67486675661 100644 --- a/hydra.nix +++ b/hydra.nix @@ -21,6 +21,23 @@ "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs.git release-19.03", "emailresponsible": false } } } + , + "dev": { + "enabled": 1, + "hidden": false, + "description": "jobsets", + "nixexprinput": "hnrm", + "nixexprpath": "release.nix", + "checkinterval": 300, + "schedulingshares": 100, + "enableemail": false, + "emailoverride": "", + "keepnr": 3, + "inputs": { + "hnrm": { "type": "git", "value": "https://xgitlab.cels.anl.gov/argo/hnrm.git dev", "emailresponsible": false }, + "nixpkgs": { "type": "git", "value": "git://github.com/NixOS/nixpkgs.git release-19.03", "emailresponsible": false } + } + } } EOF ''; diff --git a/install.sh b/install.sh index 50b22ba26d4a157be72b536784bfee0dbee515e8..dfdbe62f19c9376db89195f7abf3a37659de19ce 100755 --- a/install.sh +++ b/install.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -nix-env -f. -iA nrm --option extra-substituters http://129.114.24.212/store --option trusted-public-keys example-nix-cache-1:HSwzbJmGDidTrax3Lvx1vMSvto04VN2O5cjfXAG9uz0= +nix-env -f. -iA nrm --option extra-substituters http://129.114.24.212/serve --option trusted-public-keys example-nix-cache-1:HSwzbJmGDidTrax3Lvx1vMSvto04VN2O5cjfXAG9uz0= diff --git a/shake.sh b/shake.sh index 8e23eae9354b67d5f73a3dace92be0692b70fed1..6928ee5aef4c1bdbadb885454493fcf045e94eb9 100755 --- a/shake.sh +++ b/shake.sh @@ -6,7 +6,7 @@ if [ -z "$IN_NIX_SHELL" ] then nix-shell \ --run "runhaskell dev/shake.hs $*" \ - --option extra-substituters http://129.114.24.212/store \ + --option extra-substituters http://129.114.24.212/serve \ --option trusted-public-keys example-nix-cache-1:HSwzbJmGDidTrax3Lvx1vMSvto04VN2O5cjfXAG9uz0= else runhaskell dev/shake.hs $* diff --git a/shell.sh b/shell.sh index 41dd6f4892e7a125d4d2a204646368d43b3e8526..968771bf3c6588ac7630cfb7d6b71c9069110cab 100755 --- a/shell.sh +++ b/shell.sh @@ -1,2 +1,2 @@ #!/usr/bin/env bash -nix-shell --option extra-substituters http://129.114.24.212/store --option trusted-public-keys example-nix-cache-1:HSwzbJmGDidTrax3Lvx1vMSvto04VN2O5cjfXAG9uz0= +nix-shell --option extra-substituters http://129.114.24.212/serve/ --option trusted-public-keys example-nix-cache-1:HSwzbJmGDidTrax3Lvx1vMSvto04VN2O5cjfXAG9uz0=