summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* environment.noXlibs: disable gnome3 for pinentryorigin/noxlibs-nognomegitlab.intr/noxlibs-nognomeWout Mertens2019-06-281-1/+1
* Merge branch 'staging-19.03' into release-19.03Vladimír Čunát2019-06-281-2/+14
|\
| * bluez: CVE-2018-10910•••(cherry picked from commit 7fdb0d28d724998fdabce5868a19bf77c3115974) Marek Mahut2019-06-251-2/+14
* | linux: 4.9.183 -> 4.9.184Tim Steinbach2019-06-281-2/+2
* | linux: 4.4.183 -> 4.4.184Tim Steinbach2019-06-281-2/+2
* | linux: 4.14.130 -> 4.14.131Tim Steinbach2019-06-281-2/+2
* | Merge pull request #63728 from basvandijk/cargo-license-0.2.0-release-19.03•••Backport "cargo-license: init at 0.2.0" to release-19.03Bas van Dijk2019-06-263-0/+322
|\ \
| * | cargo-license: add meta.homepage•••(cherry picked from commit b95c4ce302ba7bb2cddcd3b33862e418ddc57ed8) Bas van Dijk2019-06-251-0/+1
| * | cargo-license: init at 0.2.0•••(cherry picked from commit 7720379005cb765abf0ab16b87f540cbea50e2f8) Bas van Dijk2019-06-253-0/+321
* | | grafana: 6.2.4 -> 6.2.5•••(cherry picked from commit d0683d4a878dbe357a74a92eac7fcbd4bf392da7) WilliButz2019-06-261-3/+3
* | | linux: 5.1.14 -> 5.1.15Tim Steinbach2019-06-251-2/+2
* | | linux: 4.19.55 -> 4.19.56Tim Steinbach2019-06-251-2/+2
* | | linux: 4.14.129 -> 4.14.130Tim Steinbach2019-06-251-2/+2
* | | duplicati: allow changing the user•••(cherry picked from commit e8916cc6af7daf2de5008f3063441c8b3f00e9ac) Signed-off-by: Domen Kožar <domen@dev.si> Domen Kožar2019-06-251-2/+16
* | | rambox: 0.6.6 -> 0.6.9 (19.03 backport) (#63737)•••rambox: 0.6.6 -> 0.6.9 (19.03 backport)Jörg Thalheim2019-06-251-3/+3
|\ \ \
| * | | rambox: 0.6.7 -> 0.6.9•••(cherry picked from commit dce97daeda9ec110be55456fd2e3be57aed2ba71) Jörg Thalheim2019-06-241-2/+2
| * | | rambox: 0.6.6 -> 0.6.7•••(cherry picked from commit c0abf3c23eebb184ff2d05593d55cfd84cd5e9b7) Andy White2019-06-241-3/+3
* | | | Merge pull request #63742 from florianjacob/backport-journalwatch•••journalwatch: fix pytest checksworldofpeace2019-06-241-6/+2
|\ \ \ \ | |/ / / |/| | |
| * | | journalwatch: fix pytest checks•••(cherry picked from commit ee20ba83144551497fcecedca277f5de32e81c0c) Reason: The more strict dependency handling of buildPythonPackage in 19.03 uncovered the error of having pytest as buildInput instead of checkInput, which leads to a broken package on 19.03. Florian Jacob2019-06-241-6/+2
|/ / /
* | | duplicati: 2.0.3.3 -> 2.0.4.5•••(cherry picked from commit 5a21a5207423953f2cadf88332a603c1a9f01598) Signed-off-by: Domen Kožar <domen@dev.si> Domen Kožar2019-06-241-3/+3
* | | Merge #63484: linux_5_0: remove•••(cherry picked from commit 57b1f5386289dbe4be14ac8960687c12334d6dfb) Alyssa Ross2019-06-242-27/+0
|/ /
* | Merge pull request #63718 from basvandijk/composable-mkshell-shellHook-releas...•••Backport "Improve composability of mkShell" to release-19.03Bas van Dijk2019-06-241-7/+6
|\ \
| * | mkShell: compose shellHooks•••Running the following expression with nix-shell: let pkgs = import <nixpkgs> {}; shell1 = pkgs.mkShell { shellHook = '' echo shell1 ''; }; shell2 = pkgs.mkShell { shellHook = '' echo shell2 ''; }; shell3 = pkgs.mkShell { inputsFrom = [ shell1 shell2 ]; shellHook = '' echo shell3 ''; }; in shell3 Will now results in: shell2 shell1 shell3 Note that packages in the front of inputsFrom have precedence over packages in the back. The outermost mkShell has precedence over all. (cherry picked from commit 76ef802d3d60cc4d199f19ba69e8bcfe63b88e7b) Bas van Dijk2019-06-241-0/+4
| * | mkshell: improve mergeInputs•••mergeInputs is now simply defined in terms of `concatLists` and `catAttrs` instead of a more complicated `foldr`. Note that the order of PATH has also changed. For example running the following with nix-shell: let pkgs = import <nixpkgs> {}; shell1 = pkgs.mkShell { buildInputs = [ pkgs.htop ]; }; shell2 = pkgs.mkShell { buildInputs = [ pkgs.hello ]; }; shell3 = pkgs.mkShell { inputsFrom = [ shell1 shell2 ]; buildInputs = [ pkgs.tree ]; }; in shell3 Results in the following PATH: $ echo $PATH ... /nix/store/yifq4bikf7m07160bpia7z48ciqddbfi-tree-1.8.0/bin: /nix/store/vhxqk81234ivqw1a7j200a1c69k8mywi-htop-2.2.0/bin: /nix/store/n9vm3m58y1n3rg3mlll17wanc9hln58k-hello-2.10/bin ... Previously the order was: /nix/store/n9vm3m58y1n3rg3mlll17wanc9hln58k-hello-2.10/bin /nix/store/vhxqk81234ivqw1a7j200a1c69k8mywi-htop-2.2.0/bin: /nix/store/yifq4bikf7m07160bpia7z48ciqddbfi-tree-1.8.0/bin: I think the new order makes more sense because it allows to override the PATH in the outermost mkShell. (cherry picked from commit cee35739ff0800f5738ecbedb43c356a2f06c96f) Bas van Dijk2019-06-241-7/+2
|/ /
* | tomcat85: 8.5.35 -> 8.5.42Johan Thomsen2019-06-241-2/+2
* | tomcat9: 9.0.13 -> 9.0.21Johan Thomsen2019-06-241-2/+2
* | Merge branch 'staging-19.03' into release-19.03Vladimír Čunát2019-06-242-0/+14
|\|
| * Merge branch 'release-19.03' into staging-19.03Vladimír Čunát2019-06-22148-2121/+4403
| |\
| * | bzip2: patch CVE-2019-12900•••The vulnerability seems quite serious. It isn't practical to use fetchpatch here due to bootstrapping, so I just committed the small patch file. (cherry picked from commit 4fd6cb7abdac13dcb70651dabc33c03f5bc9b16e) Vladimír Čunát2019-06-222-0/+14
* | | nixos: add hardware/network/intel-2200bg.nix to module-list•••this is referenced by nixos-generate-config.pl. See https://github.com/NixOS/nixpkgs/pull/63091 for more discussion. (cherry picked from commit 8768d1c83afe012ec5a19ff1faa63fd7f560c01f) Matthew Bauer2019-06-231-0/+1
* | | postgresql_11: 11.3 -> 11.4Mario Rodas2019-06-231-2/+2
* | | postgresql_10: 10.8 -> 10.9Mario Rodas2019-06-231-2/+2
* | | postgresql_9_6: 9.6.13 -> 9.6.14Mario Rodas2019-06-231-2/+2
* | | postgresql_9_5: 9.5.17 -> 9.5.18Mario Rodas2019-06-231-2/+2
* | | postgresql_9_4: 9.4.22 -> 9.4.23Mario Rodas2019-06-231-2/+2
* | | buildGoPackage: keep string context (#63680)•••In Nix, each string has a context that it carries of where it originated. Some functions like filterAttrs modify the context of its args when doing comparisons. That is important because we use the string context of “name” to get where a derivation was defined. This causes some builtins like unsafeGetAttrPos to report incorrectly that the string was set in lib/attrsets.nix and reporting that as the source file. Using removeAttrs avoids this problem. Fixes #63679 (cherry picked from commit 1f46aaab1b679b4db0b78b3ee16c0978f0bf66aa) The web list of packages shows the current stable branch, so we needed to backport this to fix that effect soonish. The change itself seems very safe; only one rebuild is detected: `common-updater-scripts` Matthew Bauer2019-06-231-4/+2
* | | Merge #63205: dhcpcd: apply security fixes (release-19.03)•••CVE-2019-11577 CVE-2019-11578 CVE-2019-11579 CVE-2019-11766 I checked the commit hashes agree with those linked from nvd.nist.gov Vladimír Čunát2019-06-231-1/+39
|\ \ \
| * | | dhcpcd: CVE-2019-11577 CVE-2019-11578 CVE-2019-11579 CVE-2019-11766Marek Mahut2019-06-161-1/+39
* | | | linux_4_{14,19}: restore __kernel_fpu_{begin,restore} (#63665)•••linux_4_{14,19}: restore __kernel_fpu_{begin,restore}Jörg Thalheim2019-06-231-0/+2
|\ \ \ \
| * | | | linux_4_19: restore __kernel_fpu_{begin,restore}•••Linux commit 12209993e98c5fa1855c467f22a24e3d5b8be205 was backported to 4.19, so add the reverting patch to restore zfs performance. (cherry picked from commit 0e6d0c12e4dda75d4399cb23871dcbbc2df8d5ed) tilpner2019-06-221-0/+1
| * | | | linux_4_14: restore __kernel_fpu_{begin,restore}•••Linux commit 12209993e98c5fa1855c467f22a24e3d5b8be205 was backported to 4.14, so add the reverting patch to restore zfs performance. (cherry picked from commit 71b4b7b4c7ccbc6c51a7ace81930715722620ff2) tilpner2019-06-221-0/+1
* | | | | microcodeIntel: 20190514 -> 20190618•••(cherry picked from commit 6dbb142de43b9f0445d4072d8105f6b9103fa1d0) Martin Weinelt2019-06-221-2/+2
* | | | | linux: 5.1.12 -> 5.1.14Tim Steinbach2019-06-221-2/+2
* | | | | linux: 4.9.182 -> 4.9.183Tim Steinbach2019-06-221-2/+2
* | | | | linux: 4.4.182 -> 4.4.183Tim Steinbach2019-06-221-2/+2
* | | | | linux: 4.19.53 -> 4.19.55Tim Steinbach2019-06-221-2/+2
* | | | | linux: 4.14.128 -> 4.14.129Tim Steinbach2019-06-221-2/+2
| |_|_|/ |/| | |
* | | | Merge #63640: thunderbird*: 60.7.1 -> 60.7.2 (security)•••https://www.thunderbird.net/en-US/thunderbird/60.7.2/releasenotes/ https://www.mozilla.org/en-US/security/advisories/mfsa2019-20/ (cherry picked from commit 2873952068673d945acf37136ebc099aaa8972cc) Vladimír Čunát2019-06-222-235/+235
* | | | firefoxPackages.tor-browser: 8.5.0 -> 8.5.2•••(cherry picked from commit 2cec4ca4f4a55fbc204ad0baf0d61175da5832be) SLNOS2019-06-211-4/+4
* | | | tor-browser-bundle-bin: 8.5.1 -> 8.5.3•••(cherry picked from commit 24434e85f62a78c296bc7dd7d41f2e82ca0077fa) Joachim Fasting2019-06-211-3/+3
generated by cgit v1.2.3 (git 2.52.0) at 2026-01-17 03:02:55 +0000