Compare commits
	
		
			14 Commits
		
	
	
		
			flakes-git
			...
			user-count
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | 0f50057886 | ||
|  | 7a7eae594b | ||
|  | 3fd5ca6446 | ||
|  | 6e7c9a9516 | ||
|  | 7dec9775e5 | ||
|  | 2fc50b7dbd | ||
|  | 82ce26d8eb | ||
|  | 439f71762b | ||
|  | 73f48ce8fb | ||
|  | 941ffc2ad5 | ||
|  | 6a1044d4ed | ||
|  | 6f6cb173e2 | ||
|  | 17775af2a2 | ||
|  | aeb0bfb217 | 
| @@ -21,23 +21,31 @@ fi | |||||||
|  |  | ||||||
| # Nix installer flags | # Nix installer flags | ||||||
| installer_options=( | installer_options=( | ||||||
|   --daemon |  | ||||||
|   --daemon-user-count 4 |  | ||||||
|   --no-channel-add |   --no-channel-add | ||||||
|   --darwin-use-unencrypted-nix-store-volume |   --darwin-use-unencrypted-nix-store-volume | ||||||
|   --nix-extra-conf-file /tmp/nix.conf |   --nix-extra-conf-file /tmp/nix.conf | ||||||
| ) | ) | ||||||
|  |  | ||||||
|  | # only use the nix-daemon settings if on darwin (which get ignored) or systemd is supported | ||||||
|  | if [[ $OSTYPE =~ darwin || -e /run/systemd/system ]]; then | ||||||
|  |   installer_options+=( | ||||||
|  |     --daemon | ||||||
|  |     --daemon-user-count `python -c 'import multiprocessing as mp; print(mp.cpu_count() * 2)'` | ||||||
|  |   ) | ||||||
|  | else | ||||||
|  |   # "fix" the following error when running nix* | ||||||
|  |   # error: the group 'nixbld' specified in 'build-users-group' does not exist | ||||||
|  |   mkdir -m 0755 /etc/nix | ||||||
|  |   echo "build-users-group =" > /etc/nix/nix.conf | ||||||
|  | fi | ||||||
|  |  | ||||||
| if [[ $INPUT_INSTALL_OPTIONS != "" ]]; then | if [[ $INPUT_INSTALL_OPTIONS != "" ]]; then | ||||||
|   IFS=' ' read -r -a extra_installer_options <<< $INPUT_INSTALL_OPTIONS |   IFS=' ' read -r -a extra_installer_options <<< $INPUT_INSTALL_OPTIONS | ||||||
|   installer_options=("${extra_installer_options[@]}" "${installer_options[@]}") |   installer_options=("${extra_installer_options[@]}" "${installer_options[@]}") | ||||||
| fi | fi | ||||||
|  |  | ||||||
| echo "installer options: ${installer_options[@]}" | echo "installer options: ${installer_options[@]}" | ||||||
| # On self-hosted runners we don't need to install more than once |  | ||||||
| if [[ ! -d /nix/store ]]  |  | ||||||
| then  |  | ||||||
| sh <(curl --retry 5 --retry-connrefused -L "${INPUT_INSTALL_URL:-https://nixos.org/nix/install}") "${installer_options[@]}" | sh <(curl --retry 5 --retry-connrefused -L "${INPUT_INSTALL_URL:-https://nixos.org/nix/install}") "${installer_options[@]}" | ||||||
| fi |  | ||||||
|  |  | ||||||
| if [[ $OSTYPE =~ darwin ]]; then | if [[ $OSTYPE =~ darwin ]]; then | ||||||
|   # Disable spotlight indexing of /nix to speed up performance |   # Disable spotlight indexing of /nix to speed up performance | ||||||
|   | |||||||
							
								
								
									
										91
									
								
								yarn.lock
									
									
									
									
									
								
							
							
						
						
									
										91
									
								
								yarn.lock
									
									
									
									
									
								
							| @@ -737,10 +737,10 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.4.2: | |||||||
|     escape-string-regexp "^1.0.5" |     escape-string-regexp "^1.0.5" | ||||||
|     supports-color "^5.3.0" |     supports-color "^5.3.0" | ||||||
|  |  | ||||||
| chownr@^1.1.1: | chownr@^1.1.4: | ||||||
|   version "1.1.3" |   version "1.1.4" | ||||||
|   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz#42d837d5239688d55f303003a508230fa6727142" |   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" | ||||||
|   integrity sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw== |   integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== | ||||||
|  |  | ||||||
| ci-info@^2.0.0: | ci-info@^2.0.0: | ||||||
|   version "2.0.0" |   version "2.0.0" | ||||||
| @@ -1222,7 +1222,7 @@ fragment-cache@^0.2.1: | |||||||
|   dependencies: |   dependencies: | ||||||
|     map-cache "^0.2.2" |     map-cache "^0.2.2" | ||||||
|  |  | ||||||
| fs-minipass@^1.2.5: | fs-minipass@^1.2.7: | ||||||
|   version "1.2.7" |   version "1.2.7" | ||||||
|   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" |   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" | ||||||
|   integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== |   integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== | ||||||
| @@ -2307,25 +2307,12 @@ minimatch@^3.0.4: | |||||||
|   dependencies: |   dependencies: | ||||||
|     brace-expansion "^1.1.7" |     brace-expansion "^1.1.7" | ||||||
|  |  | ||||||
| minimist@0.0.8: |  | ||||||
|   version "0.0.8" |  | ||||||
|   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" |  | ||||||
|   integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0= |  | ||||||
|  |  | ||||||
| minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5: | minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5: | ||||||
|   version "1.2.5" |   version "1.2.5" | ||||||
|   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" |   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" | ||||||
|   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== |   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== | ||||||
|  |  | ||||||
| minipass@^2.6.0, minipass@^2.8.6: | minipass@^2.6.0, minipass@^2.9.0: | ||||||
|   version "2.8.6" |  | ||||||
|   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.8.6.tgz#620d889ace26356391d010ecb9458749df9b6db5" |  | ||||||
|   integrity sha512-lFG7d6g3+/UaFDCOtqPiKAC9zngWWsQZl1g5q6gaONqrjq61SX2xFqXMleQiFVyDpYwa018E9hmlAFY22PCb+A== |  | ||||||
|   dependencies: |  | ||||||
|     safe-buffer "^5.1.2" |  | ||||||
|     yallist "^3.0.0" |  | ||||||
|  |  | ||||||
| minipass@^2.9.0: |  | ||||||
|   version "2.9.0" |   version "2.9.0" | ||||||
|   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" |   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" | ||||||
|   integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== |   integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== | ||||||
| @@ -2333,10 +2320,10 @@ minipass@^2.9.0: | |||||||
|     safe-buffer "^5.1.2" |     safe-buffer "^5.1.2" | ||||||
|     yallist "^3.0.0" |     yallist "^3.0.0" | ||||||
|  |  | ||||||
| minizlib@^1.2.1: | minizlib@^1.3.3: | ||||||
|   version "1.3.2" |   version "1.3.3" | ||||||
|   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.2.tgz#5d24764998f98112586f7e566bd4c0999769dad4" |   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" | ||||||
|   integrity sha512-lsNFqSHdJ21EwKzCp12HHJGxSMtHkCW1EMA9cceG3MkMNARjuWotZnMe3NKNshAvFXpm4loZqmYsCmRwhS2JMw== |   integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== | ||||||
|   dependencies: |   dependencies: | ||||||
|     minipass "^2.9.0" |     minipass "^2.9.0" | ||||||
|  |  | ||||||
| @@ -2348,12 +2335,12 @@ mixin-deep@^1.2.0: | |||||||
|     for-in "^1.0.2" |     for-in "^1.0.2" | ||||||
|     is-extendable "^1.0.1" |     is-extendable "^1.0.1" | ||||||
|  |  | ||||||
| mkdirp@0.x, mkdirp@^0.5.0, mkdirp@^0.5.1: | mkdirp@0.x, mkdirp@^0.5.1, mkdirp@^0.5.5: | ||||||
|   version "0.5.1" |   version "0.5.5" | ||||||
|   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" |   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" | ||||||
|   integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= |   integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== | ||||||
|   dependencies: |   dependencies: | ||||||
|     minimist "0.0.8" |     minimist "^1.2.5" | ||||||
|  |  | ||||||
| ms@2.0.0: | ms@2.0.0: | ||||||
|   version "2.0.0" |   version "2.0.0" | ||||||
| @@ -2671,9 +2658,9 @@ path-key@^2.0.0, path-key@^2.0.1: | |||||||
|   integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= |   integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= | ||||||
|  |  | ||||||
| path-parse@^1.0.6: | path-parse@^1.0.6: | ||||||
|   version "1.0.6" |   version "1.0.7" | ||||||
|   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" |   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" | ||||||
|   integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== |   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== | ||||||
|  |  | ||||||
| path-type@^3.0.0: | path-type@^3.0.0: | ||||||
|   version "3.0.0" |   version "3.0.0" | ||||||
| @@ -2950,10 +2937,10 @@ rsvp@^4.8.4: | |||||||
|   resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734" |   resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734" | ||||||
|   integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA== |   integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA== | ||||||
|  |  | ||||||
| safe-buffer@^5.0.1, safe-buffer@^5.1.2: | safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@^5.2.1: | ||||||
|   version "5.2.0" |   version "5.2.1" | ||||||
|   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519" |   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" | ||||||
|   integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg== |   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== | ||||||
|  |  | ||||||
| safe-buffer@~5.1.0, safe-buffer@~5.1.1: | safe-buffer@~5.1.0, safe-buffer@~5.1.1: | ||||||
|   version "5.1.2" |   version "5.1.2" | ||||||
| @@ -3292,17 +3279,17 @@ symbol-tree@^3.2.2: | |||||||
|   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== |   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== | ||||||
|  |  | ||||||
| tar@^4: | tar@^4: | ||||||
|   version "4.4.13" |   version "4.4.19" | ||||||
|   resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" |   resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.19.tgz#2e4d7263df26f2b914dee10c825ab132123742f3" | ||||||
|   integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== |   integrity sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA== | ||||||
|   dependencies: |   dependencies: | ||||||
|     chownr "^1.1.1" |     chownr "^1.1.4" | ||||||
|     fs-minipass "^1.2.5" |     fs-minipass "^1.2.7" | ||||||
|     minipass "^2.8.6" |     minipass "^2.9.0" | ||||||
|     minizlib "^1.2.1" |     minizlib "^1.3.3" | ||||||
|     mkdirp "^0.5.0" |     mkdirp "^0.5.5" | ||||||
|     safe-buffer "^5.1.2" |     safe-buffer "^5.2.1" | ||||||
|     yallist "^3.0.3" |     yallist "^3.1.1" | ||||||
|  |  | ||||||
| test-exclude@^5.2.3: | test-exclude@^5.2.3: | ||||||
|   version "5.2.3" |   version "5.2.3" | ||||||
| @@ -3618,9 +3605,9 @@ write-file-atomic@2.4.1: | |||||||
|     signal-exit "^3.0.2" |     signal-exit "^3.0.2" | ||||||
|  |  | ||||||
| ws@^5.2.0: | ws@^5.2.0: | ||||||
|   version "5.2.2" |   version "5.2.3" | ||||||
|   resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.2.tgz#dffef14866b8e8dc9133582514d1befaf96e980f" |   resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.3.tgz#05541053414921bc29c63bee14b8b0dd50b07b3d" | ||||||
|   integrity sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA== |   integrity sha512-jZArVERrMsKUatIdnLzqvcfydI85dvd/Fp1u/VOpfdDWQ4c9qWXe+VIeAbQ5FrDwciAkr+lzofXLz3Kuf26AOA== | ||||||
|   dependencies: |   dependencies: | ||||||
|     async-limiter "~1.0.0" |     async-limiter "~1.0.0" | ||||||
|  |  | ||||||
| @@ -3634,10 +3621,10 @@ y18n@^4.0.0: | |||||||
|   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4" |   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4" | ||||||
|   integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ== |   integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ== | ||||||
|  |  | ||||||
| yallist@^3.0.0, yallist@^3.0.3: | yallist@^3.0.0, yallist@^3.1.1: | ||||||
|   version "3.1.0" |   version "3.1.1" | ||||||
|   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.0.tgz#906cc2100972dc2625ae78f566a2577230a1d6f7" |   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" | ||||||
|   integrity sha512-6gpP93MR+VOOehKbCPchro3wFZNSNmek8A2kbkOAZLIZAYx1KP/zAqwO0sOHi3xJEb+UBz8NaYt/17UNit1Q9w== |   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== | ||||||
|  |  | ||||||
| yargs-parser@10.x: | yargs-parser@10.x: | ||||||
|   version "10.1.0" |   version "10.1.0" | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user