summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2020-11-28Merge remote-tracking branch 'upstream/master' into aj-rust-custom-targetJohn Ericson
2020-11-28Merge remote-tracking branch 'upstream/master' into aj-rust-custom-targetJohn Ericson
2020-11-28Merge pull request #105155 from FRidh/spliceJohn Ericson
Python: rename internal parameters related to splicing and fix splicing
2020-11-28Merge pull request #105231 from nyanotech/masterMartin Weinelt
factorio-experimental, factorio-headless-experimental: 1.1.1 -> 1.1.2
2020-11-28Python: add todo note regarding pythonForBuildFrederik Rietdijk
2020-11-28Python splicing: splice package sets, not Python derivationFrederik Rietdijk
In the original commit the various builds of Python were added to `otherSplices`, instead of the intended Python package sets.
2020-11-28Python: rename parameters and arguments passed to passthruFrederik Rietdijk
As part of the splicing the build/host/target combinations of the interpreter need to be passed around internally. The chosen names were not very clear, implying they were package sets whereas actually there were derivations.
2020-11-28Merge pull request #89312 from SCOTT-HAMILTON/vim-asyncSandro
vim-async: Init at 2020-03-17
2020-11-28Merge pull request #105241 from prusnak/electronPavol Rusnak
Electron updates
2020-11-28electron: add header hashesPavol Rusnak
2020-11-28electron: passthru headersJaka Hudoklin
2020-11-28electron: 11.0.2 -> 11.0.3Pavol Rusnak
2020-11-28electron: 9.3.4 -> 9.3.5Pavol Rusnak
2020-11-28Merge pull request #104442 from freezeboy/migrate-heaptrackDoron Behar
heaptrack: migrate to Qt5.15
2020-11-28Merge pull request #105030 from freezeboy/add-akvcamDoron Behar
linuxPackages.akvcam: init at 1.1.1
2020-11-28Merge pull request #105044 from freezeboy/add-glabDoron Behar
gitAndTools.glab: init at 1.11.1
2020-11-28Merge pull request #74845 from dmrauh/add/dsf2flacSandro
2020-11-28Merge pull request #105209 from r-ryantm/auto-update/ircd-hybridSandro
ircdHybrid: 8.2.24 -> 8.2.35
2020-11-28Merge pull request #103169 from freezeboy/tests-pugixml2Doron Behar
pugixml: move check steps to preCheck hook
2020-11-28Merge pull request #104222 from freezeboy/unbreak-tubeupDoron Behar
2020-11-28Merge pull request #104491 from freezeboy/remove-macpath-droopyDoron Behar
2020-11-28Merge pull request #104447 from freezeboy/update-iannixDoron Behar
2020-11-28Merge pull request #104496 from freezeboy/update-tautulliDoron Behar
tautulli: 2.2.4 -> 2.6.1
2020-11-28python.tests: use self.callPackage instead of super.callPackageFrederik Rietdijk
super was incorrectly possible until https://github.com/NixOS/nixpkgs/pull/104201 got merged.
2020-11-28Merge pull request #104171 from freezeboy/unbreak-dsview-qt515Doron Behar
dsview: 0.99 -> 1.12
2020-11-28Merge pull request #104180 from freezeboy/remove-qt512-kpkpassDoron Behar
kpkpass: remove before Qt5.13
2020-11-28Merge pull request #104432 from freezeboy/migrate-partition-managerDoron Behar
partition-manager: migrate to Qt5.15
2020-11-28Merge pull request #104175 from freezeboy/remove-qt512-akonadiDoron Behar
akonadi: disable Qt5 <5.13
2020-11-28Merge pull request #104841 from ↵Andreas Rammhold
redvers/update_cassandra_3.0.17_to_3.0.23_cve-2020-13946 cassandra_3_0: 3.0.17 -> 3.0.23
2020-11-28Python: use pythonPackagesBuildHost instead of pythonForBuildFrederik Rietdijk
Follow-up to #104201, related to #105113.
2020-11-28Merge pull request #105200 from ryantm/update-ruby-docRyan Mulligan
doc: Ruby to CommonMark
2020-11-28Merge pull request #105017 from mweinelt/zsh-powerlevel10kMartin Weinelt
zsh-powerlevel10k: 1.13.0 -> 1.14.3
2020-11-28Merge pull request #105211 from r-ryantm/auto-update/jettyMario Rodas
jetty: 9.4.34.v20201102 -> 9.4.35.v20201120
2020-11-28Merge pull request #105201 from r-ryantm/auto-update/haproxyMario Rodas
haproxy: 2.3.0 -> 2.3.1
2020-11-28Merge pull request #105220 from r-ryantm/auto-update/libavifMario Rodas
libavif: 0.8.3 -> 0.8.4
2020-11-28Merge pull request #105204 from marsam/update-postgresql-topnMario Rodas
postgresqlPackages.pg_topn: 2.3.0 -> 2.3.1
2020-11-28factorio-experimental, factorio-headless-experimental: 1.1.1 -> 1.1.2nyanotech
2020-11-28Merge pull request #104153 from r-ryantm/auto-update/highlightWilliButz
highlight: 3.57 -> 3.59
2020-11-28Merge pull request #105025 from Mic92/go-docJörg Thalheim
doc/go: convert to markdown
2020-11-28Merge pull request #67496 from mb21/patch-1Jörg Thalheim
Docs: clarify Rust overlay on non-NixOS
2020-11-28Merge pull request #105206 from r-ryantm/auto-update/gpxseeRyan Mulligan
gpxsee: 7.36 -> 7.37
2020-11-28Merge pull request #105182 from roosemberth/fixes/firejailMichael Raskin
firejail: fix -overlay and -build functionality on NixOS
2020-11-28Merge pull request #104683 from Fuseteam/patch-1maralorn
ghc8102: bootstrap with ghc8102BinaryMinimal on aarch32
2020-11-28libavif: 0.8.3 -> 0.8.4R. RyanTM
2020-11-28Merge pull request #105212 from r-ryantm/auto-update/jmolTimo Kaufmann
jmol: 14.31.17 -> 14.31.18
2020-11-28doc: clarify whitelistedLicensesGraham Bennett
see the following for more info: https://github.com/NixOS/nixpkgs/blob/076860e0340a5e4a909b9a710e186508b14d1c90/pkgs/stdenv/generic/check-meta.nix#L229
2020-11-28ocamlPackages.sqlexpr: use ocaml-migrate-parsetree 2.1.0sternenseemann
2020-11-28ocamlPackages.ocaml-monadic: use ocaml-migrate-parsetree 2.1.0sternenseemann
2020-11-28ocamlPackages.lwt: use ocaml-migrate-parsetree 2.1.0sternenseemann
2020-11-28ocamlPackages.rpclib-lwt: init at 8.0.0Vincent Laporte