Commit Graph

9543 Commits

Author SHA1 Message Date
Luke Worth 60f31b6692 nix-direnv: make flakes support optional
`nix-direnv` depends on `nixUnstable` for flakes support, but that
causes it to print a warning unless your user is trusted or the
`experimental-features` setting is enabled. Neither of these are
desirable (note that setting `experimental-features` in nix.conf causes
warnings on `nixStable`).

Since flakes are experimental, this commit makes `nixStable` the default
and optionally allows `nixUnstable` with a new flag `enableFlakes`,
prioritising a good experience for users not using experimental
features.

(cherry picked from commit 03310df843a344215b45b2e8aef11ae9402a40e2)
2021-06-08 07:58:48 +00:00
zowoq 829e821768 youtube-dl: 2021.05.16 -> 2021.06.06
https://github.com/ytdl-org/youtube-dl/releases/tag/2021.06.06
(cherry picked from commit df82caf8df911674f65cf63f388b7820d410c334)
2021-06-06 08:31:30 +00:00
Serg Nesterov ce9c83cee0 tmuxinator: 2.0.2 -> 2.0.3
tmuxinator 2.0.3 fixes a compatibility warning with tmux 2.3, which is
the version packaged on NixOS 21.05.

See https://github.com/tmuxinator/tmuxinator/issues/814

(cherry picked from commit 28ab65b5869c6673e359093662a1dfe3aba9b829)
2021-06-05 13:53:59 +02:00
Sandro 3b7c820173
Merge pull request #124927 from NixOS/backport-124211-to-release-21.05
[Backport release-21.05] betterdiscordctl: 1.7.1 -> 2.0.0
2021-05-31 09:13:58 +02:00
Robert Scott 2063939edd
Merge pull request #124940 from NixOS/backport-124351-to-release-21.05
[Backport release-21.05] sacad: 2.3.4 -> 2.4.0
2021-05-30 12:33:13 +01:00
Robert Schütz e3ddcfdf2c capture: use ffmpeg instead of ffmpeg_3
(cherry picked from commit 36f7a012b798b90ac05b1d31bd7c468d01a6b327)
2021-05-29 23:58:51 -04:00
fortuneteller2k 0659aeb14f sacad: 2.3.4 -> 2.4.0
(cherry picked from commit 753452f8084a9e151d8c2118d11f327cbd42b315)
2021-05-30 03:20:42 +00:00
Dusk Banks 9cab6e0dd4 betterdiscordctl: 1.7.1 -> 2.0.0
(cherry picked from commit 35a1e99d7a41ab5da0afba91f69b49495f7c85f8)
2021-05-30 02:04:55 +00:00
fortuneteller2k b1a828fa56 fetchutils: remove DESTDIR, use PREFIX, change owner
(cherry picked from commit feef79647f1da6fe2e06e9cfc72dd923641a3c7e)
2021-05-28 18:35:43 -04:00
Arthur Gautier 4e172daaa6 diffoscope: 175 -> 176
Signed-off-by: Arthur Gautier <baloo@superbaloo.net>
(cherry picked from commit fd2e675e7c5205c0c6e3bcdad7f10a2db8fe25d0)
2021-05-28 19:38:56 +00:00
Maximilian Bosch 25eaf1083f
diffoscope: fix build
ZHF #122042
Failing Hydra build: https://hydra.nixos.org/build/143815905

Currently the diff-check for `.mp3`-files is failing. The only reason
for that is that right now is that there are too spaces too much on the
last line[1].

[1] https://salsa.debian.org/reproducible-builds/diffoscope/-/blob/175/tests/data/mp3_expected_diff

(cherry picked from commit ea55d23cd86edf4b7d06673924284880b8a68f15)
2021-05-26 22:35:51 +02:00
Jonathan Ringer 11a9ac00fc
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
 pkgs/tools/networking/xh/default.nix
2021-05-22 18:19:10 -07:00
Sandro 62c7925218
Merge pull request #123977 from fortuneteller2k/bfetch 2021-05-22 16:42:52 +02:00
Sandro 1fc45b3925
Merge pull request #123982 from zowoq/fzf 2021-05-22 16:07:11 +02:00
github-actions[bot] 563389a7fd
Merge master into staging-next 2021-05-22 12:27:09 +00:00
fortuneteller2k 290fa04d05 fetchutils: init at unstable-2021-03-16 2021-05-22 16:40:31 +08:00
zowoq 60dfaef8e1 fzf: 0.27.0 -> 0.27.1
https://github.com/junegunn/fzf/releases/tag/0.27.1
2021-05-22 16:38:22 +10:00
fortuneteller2k 76c2b90825 bfetch: init at unstable-2021-05-21 2021-05-22 13:59:44 +08:00
Jonathan Ringer 7507aed4e1
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
 pkgs/development/tools/rust/cargo-expand/default.nix
 pkgs/tools/misc/blflash/default.nix
2021-05-21 19:49:05 -07:00
R. RyanTM dac51dfb1f blflash: 0.3.2 -> 0.3.3 2021-05-21 19:43:10 -07:00
Sandro fc52705512
Merge pull request #123700 from humancalico/tremor-bump 2021-05-21 19:49:53 +02:00
Jonathan Ringer 5cd5b9b97f
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
 pkgs/development/tools/kubie/default.nix
2021-05-21 10:39:34 -07:00
Akshat Agarwal a7de6d3c89 tremor-rs: 0.11.1 -> 0.11.2 2021-05-21 16:08:22 +00:00
Eelco Dolstra 62ee635d53
Replace nixFlakes -> nixUnstable 2021-05-21 15:23:52 +02:00
Jonathan Ringer 6b15fdce86
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
 pkgs/shells/ion/default.nix
 pkgs/tools/misc/cicero-tui/default.nix
2021-05-20 22:11:42 -07:00
R. RyanTM d6f68269de cicero-tui: 0.2.0 -> 0.2.1 2021-05-20 14:44:31 -07:00
Jonathan Ringer 14f3686af1
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
  pkgs/applications/terminal-emulators/alacritty/default.nix
  pkgs/servers/clickhouse/default.nix
2021-05-20 09:12:42 -07:00
Kevin Cox a5eee47d7f
fx_cast_bridge: 0.0.7 -> 0.1.2 (#121963)
The prevision version was out-of-date and incompatible with the latest extension.

This also updates to build from source.

Right now we also ship the devDependencies of the bridge due to limitations in node2nix.
2021-05-20 09:46:51 -04:00
Dmitry Kalinkin d61cf2be36
Merge pull request #123581 from veprbl/pr/bibutils_enable_darwin
bibutils: enable darwin
2021-05-20 04:13:59 -04:00
Mica Semrick b34ab9683c wlc: init at 1.11 2021-05-19 21:38:52 -07:00
Robin Gloster b6b335f977
Merge pull request #123604 from mweinelt/esphome
esphome: 1.17.2 -> 1.18.0
2021-05-19 16:06:29 -05:00
Jonathan Ringer c1f8a15dac
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
  nixos/doc/manual/release-notes/rl-2105.xml
  pkgs/tools/security/sequoia/default.nix
2021-05-19 10:39:54 -07:00
Stéphan Kochen 36d0bcdca8 xvfb-run: mark as linux-only 2021-05-19 10:35:45 -07:00
Sandro a3594e0e19
Merge pull request #123520 from figsoda/macchina
macchina: 0.7.2 -> 0.8.1
2021-05-19 17:49:16 +02:00
sophrosyne97 667950d4e8 silicon: fix build error 2021-05-18 18:45:31 -07:00
Martin Weinelt 6be9a81363
esphome: 1.17.2 -> 1.18.0 2021-05-19 03:09:19 +02:00
github-actions[bot] 7000ae2b9a
Merge master into staging-next 2021-05-19 00:55:36 +00:00
Robert Scott 90b400677b
Merge pull request #123541 from stephank/fix-xcd-darwin
xcd: fix darwin build
2021-05-19 00:24:52 +01:00
Robert Scott 56e44391ca
Merge pull request #123545 from stephank/fix-websocat-darwin
websocat: fix darwin build
2021-05-19 00:15:24 +01:00
Robert Scott 7f29e5fbcf
Merge pull request #123570 from stephank/fix-heimdall-darwin
heimdall: fix non-GUI build on darwin
2021-05-18 23:36:06 +01:00
Stéphan Kochen 1dbb8fa2be
wagyu: fix darwin build (#123547) 2021-05-18 17:16:58 -04:00
Dmitry Kalinkin b75ce20dfa
bibutils: enable on darwin 2021-05-18 16:15:29 -04:00
Dmitry Kalinkin 8c5fd78d0b
bibutils: support static builds 2021-05-18 16:14:57 -04:00
Stéphan Kochen 4731287e19 heimdall: fix non-GUI build on darwin 2021-05-18 21:27:32 +02:00
Jonathan Ringer ca46ad3762
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
  pkgs/tools/package-management/cargo-release/default.nix
2021-05-18 11:03:38 -07:00
Stéphan Kochen 8e713d34d8 websocat: fix darwin build 2021-05-18 19:04:13 +02:00
Pavol Rusnak ca1e28f282
Merge pull request #123499 from stephank/fix-rig-darwin
rig: fix darwin build
2021-05-18 18:55:08 +02:00
Stéphan Kochen fdca59b107 xcd: fix darwin build 2021-05-18 18:41:43 +02:00
Jonathan Ringer f7a112f6c4
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
  pkgs/applications/graphics/emulsion/default.nix
  pkgs/development/tools/misc/texlab/default.nix
  pkgs/development/tools/rust/bindgen/default.nix
  pkgs/development/tools/rust/cargo-udeps/default.nix
  pkgs/misc/emulators/ruffle/default.nix
  pkgs/tools/misc/code-minimap/default.nix
2021-05-18 08:57:16 -07:00
figsoda 1fd56f5487 macchina: 0.7.2 -> 0.8.1 2021-05-18 10:25:46 -04:00