gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
249,180 Commits 9 Branches 0 Tags
976af38df650ee6c8d9e39ff3ccc27075e75e98c
Commit Graph
249180 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael WeissandGitHub 976af38df6 libva: 2.9.0 -> 2.9.1 (#101750) 2020-10-26 16:18:04 +01:00
WilliButzandGitHub c48a9a6b53 Merge pull request #101505 from TredwellGit/nasm 
nasm: 2.14.02 -> 2.15.05 (CVE-2019-6290 CVE-2019-6291 CVE-2019-8343 CVE-2019-14248 CVE-2019-20334)
 2020-10-26 14:09:53 +01:00
Vladimír Čunát 1111911593 Merge branch 'staging-next' into staging 
I re-verified that the git-tree state looks good after
the trouble addressed in commit 89023c38fc
(by the same approach - comparison to a "clean rebase").
I was actually a little surprised that simple git merge
did the right thing this time.

The one thing I can't fix is that some of staging commits are now
reachable from master even though they're not really applied in there
yet, but that's just temporary effect until the next merge to master.
I certainly don't envy any archeology hitting these commit ranges
(e.g. bisections).
 2020-10-26 09:19:25 +01:00
Vladimír Čunát 89023c38fc Recover the complicated situation after my bad merge 
I made a mistake merge.  Reverting it in c778945806 undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.

I reconstructed the "desired" state of staging-next tree by:
 - checking out the last commit of the problematic range: 4effe769e2
 - `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
   merge commit and its revert from that range (while keeping
   reapplication from 4effe769e2)
 - merging the last unaffected staging-next commit (803ca85c20)
 - fortunately no other commits have been pushed to staging-next yet
 - applying a diff on staging-next to get it into that state
 2020-10-26 09:01:04 +01:00
Vladimír Čunát 336bc8283b Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" 
This reverts commit c778945806.

I believe this is exactly what brings the staging branch into
the right shape after the last merge from master (through staging-next);
otherwise part of staging changes would be lost
(due to being already reachable from master but reverted).
 2020-10-26 08:19:17 +01:00
WORLDofPEACEandGitHub 309ce3f8a1 Merge pull request #100031 from ju1m/gnupg 
gnupg: put libexec tools (eg. gpg-preset-passphrase) in PATH
 2020-10-25 17:39:50 -04:00
Frederik Rietdijk 8be875622e libsoup: fix eval 2020-10-25 13:47:08 +01:00
Vladimír Čunát 2f6b00b15e Merge branch 'staging-next' into staging 2020-10-25 09:47:04 +01:00
Vladimír Čunát 4bd836b381 Merge branch 'master' into staging-next 2020-10-25 09:46:04 +01:00
TredwellGitandVladimír Čunát 4effe769e2 libraw: 0.20.0 -> 0.20.2 
Reapplying the commit from PR #101508 merge, without staging changes.
(cherry picked from commit 0594e27df3)
 2020-10-25 09:44:10 +01:00
R. RyanTMandFrederik Rietdijk 961aebb1c8 clex: 4.6.patch9 -> 4.6.patch10 2020-10-25 09:43:45 +01:00
Michele Guerini RoccoandGitHub c868baa4ca Merge pull request #101614 from rnhmjoj/arx 
arx-libertatis: 2019-07-22 -> 2020-10-20
 2020-10-25 09:43:28 +01:00
R. RyanTMandFrederik Rietdijk 87b4e22f0f ckbcomp: 1.196 -> 1.197 2020-10-25 09:43:14 +01:00
R. RyanTMandFrederik Rietdijk 9baf29e382 cksfv: 1.3.14 -> 1.3.15 2020-10-25 09:42:54 +01:00
R. RyanTMandFrederik Rietdijk c04af4e84b twitterBootstrap: 4.5.2 -> 4.5.3 2020-10-25 09:42:37 +01:00
Vladimír Čunát c778945806 Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" 
I'm sorry; I didn't notice it contained staging commits.

This reverts commit 17f5305b6c, reversing
changes made to a8a018ddc0.
 2020-10-25 09:41:51 +01:00
R. RyanTMandFrederik Rietdijk 38f85a5bba libquotient: 0.5.3.2 -> 0.6.0 2020-10-25 09:41:28 +01:00
R. RyanTMandFrederik Rietdijk 4614342aae xmrig-proxy: 5.11.0 -> 6.3.0 2020-10-25 09:41:09 +01:00
R. RyanTMandFrederik Rietdijk c88f981f80 tpm2-abrmd: 2.3.2 -> 2.3.3 2020-10-25 09:40:35 +01:00
R. RyanTMandFrederik Rietdijk 6a42a70023 open-vm-tools: 11.1.0 -> 11.1.5 2020-10-25 09:39:40 +01:00
R. RyanTMandFrederik Rietdijk 8d6bd565a1 libcap_ng: 0.7.10 -> 0.7.11 2020-10-25 09:39:15 +01:00
R. RyanTMandFrederik Rietdijk 66699e2ec4 ocamlPackages.ocaml_sqlite3: 5.0.1 -> 5.0.2 2020-10-25 09:38:53 +01:00
R. RyanTMandFrederik Rietdijk a2f3c2521c android-udev-rules: 20200410 -> 20200613 2020-10-25 09:37:31 +01:00
R. RyanTMandFrederik Rietdijk e4467c94ae socket_wrapper: 1.2.4 -> 1.2.5 2020-10-25 09:35:43 +01:00
R. RyanTMandFrederik Rietdijk 3e735cf1fe libnetfilter_queue: 1.0.4 -> 1.0.5 2020-10-25 09:35:19 +01:00
R. RyanTMandFrederik Rietdijk 2dd05b3d2f wpgtk: 6.1.0 -> 6.1.3 2020-10-25 09:34:43 +01:00
R. RyanTMandFrederik Rietdijk e874acc509 belcard: 4.3.1 -> 4.4.0 2020-10-25 09:34:18 +01:00
R. RyanTMandFrederik Rietdijk 10d87a72e1 ctypes_sh: 1.1 -> 1.2 2020-10-25 09:34:01 +01:00
R. RyanTMandFrederik Rietdijk 2f474d44ff storm: 2.1.0 -> 2.2.0 2020-10-25 09:33:38 +01:00
Vladimír Čunát 17f5305b6c Merge #101508: libraw: 0.20.0 -> 0.20.2 2020-10-25 09:28:53 +01:00
Gabriel EbnerandGitHub a8a018ddc0 Merge pull request #101409 from rycee/dbus-warning 2020-10-25 09:16:28 +01:00
Michael RaskinandGitHub 0fc4bba48e Merge pull request #101632 from 7c6f434c/nyxt-deps 
pkgs.nyxt: init at 2020-10-23
 2020-10-25 08:11:05 +00:00
bqvandMichael Raskin be17edc6f6 pkgs.nyxt: init at 2020-10-23 2020-10-25 08:56:12 +01:00
Mario RodasandGitHub cbe6fd3473 Merge pull request #101441 from marsam/fix-darwin-build 
ruby: fix build on darwin
 2020-10-25 02:45:51 -05:00
Vladimír Čunát ed217bcc35 Merge #100446: python*Packages.apprise: fix dependencies 2020-10-25 08:39:18 +01:00
Bjørn Forsman 7ad5e816fa basex: fix build 
An unmatched double quote in installPhase broke the build in the last update.
Fix it.

Reported by @solson (thanks!).

Fixes: 21b9c04a2c ("basex: 8.6.6 -> 9.4.3")
 2020-10-25 08:12:25 +01:00
lewoandGitHub 7c84c74897 Merge pull request #101328 from r-ryantm/auto-update/consul_exporter 
prometheus-consul-exporter: 0.6.0 -> 0.7.1
 2020-10-25 08:09:44 +01:00
lewoandGitHub 68f03380b2 Merge pull request #101393 from 06kellyjac/tekton-cli_0.13.1 
tektoncd-cli: 0.13.0 -> 0.13.1
 2020-10-25 08:07:46 +01:00
Vladimír Čunát 803ca85c20 coreutils: fix aarch64 build by upstream patch 
https://hydra.nixos.org/build/128781441
We can't use fetchpatch here, unfortunately.
 2020-10-25 08:07:15 +01:00
Jan TojnarandGitHub 076a779d30 Merge pull request #101528 from NixOS/gnome-3.38 2020-10-25 08:06:00 +01:00
Jan TojnarandGitHub 6aa670046b Merge pull request #101387 from r-ryantm/auto-update/bluez 
bluez: 5.54 -> 5.55
 2020-10-25 07:52:27 +01:00
Jörg ThalheimandGitHub 2f31499703 Merge pull request #101611 from stigtsp/package/firefox-bin-82.0 
firefox-bin: 81.0.2 -> 82.0
 2020-10-25 07:32:30 +01:00
Jörg ThalheimandGitHub c8bccb080b Merge pull request #101624 from taku0/fix_update_nix_for_82 
firefox-bin: fix update.nix freezing
 2020-10-25 07:31:49 +01:00
R. RyanTMandJon b90d8c6849 dgraph: 20.07.0 -> 20.07.1 2020-10-24 23:18:43 -07:00
R. RyanTMandJon 2948121261 auctex: 12.2 -> 12.3 2020-10-24 23:17:49 -07:00
LuflosiandJon b8e5d13878 hdparm: name -> pname 2020-10-24 23:06:34 -07:00
zowoq 10e961cdf9 haskellPackages.trifecta: dontCheck on darwin 2020-10-25 15:59:31 +10:00
R. RyanTMandJon ec6380c788 python37Packages.trimesh: 3.8.11 -> 3.8.12 2020-10-24 22:55:33 -07:00
R. RyanTMandJon c56920d57c python37Packages.flowlogs_reader: 2.2.1 -> 2.3.0 2020-10-24 22:55:17 -07:00
R. RyanTMandJon 3b8c31e301 pwntools: 4.2.1 -> 4.2.2 2020-10-24 22:54:17 -07:00