summary refs log tree commit diff
Commit message (Collapse)AuthorAge
* Merge pull request #47395 from obsidiansystems/paxctl-darwinJohn Ericson2018-09-26
|\ | | | | paxctl: Fix darwin and cross and use for linux cross
| * Revert "stdenv: partial revert of f2bb59e"John Ericson2018-09-26
| | | | | | | | This reverts commit 607063f61be3b19a2da054776b360d9c5b03038a.
| * paxctl: Fix cross and Darwin buildsJohn Ericson2018-09-26
| |
* | Merge remote-tracking branch 'upstream/master' into stagingJohn Ericson2018-09-26
|\ \
| * | Merge commit '607063f61be3b19a2da054776b360d9c5b03038a'John Ericson2018-09-26
| |\| | | | | | | | | | | | | This gets the partial revert on the common ancestor of master and staging, easier further devlopment.
| | * stdenv: partial revert of f2bb59eMatthew Bauer2018-09-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /cc @Ericson2314 PR was https://github.com/NixOS/nixpkgs/pull/46857 This line broke MacOS cross compilation. paxctl cannot be built on macOS. Maybe it can be fixed, but no reason to break things unnecessarily. Regardless, you definitely need to be more careful about backporting. I think it’s fine to move fast and break things on master but with release-18.09 we should be more careful. Something like more automated testing for cross compilation would also be helpful (hopefully even making it block). (cherry picked from commit f9c4075873cb56464126f993d22a1a72f7cfac45)
| * | fetchFromGitLab: Fix grouping issue for group argaszlig2018-09-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue introduced by c3612b97e625ad0d70c6ba56d191bcb9a403f44c. Example output before that commit (witch a random package using fetchFromGitLab): $ nix-instantiate --eval -A hiawatha.src.urls [ "https://gitlab.com/api/v4/projects/hsleisink%2Fhiawatha/repository/archive.tar.gz?sha=v10.8.1" ] After the commit: $ nix-instantiate --eval -A hiawatha.src.urls [ "https://gitlab.com/api/v4/projects/%2Fhsleisink%2Fhiawatha/repository/archive.tar.gz?sha=v10.8.1" ] And with this very commit, which fixes the issue: $ nix-instantiate --eval -A hiawatha.src.urls [ "https://gitlab.com/api/v4/projects/hsleisink%2Fhiawatha/repository/archive.tar.gz?sha=v10.8.1" ] The problem was that it has used optionalString in conjunction with "+", so the optionalString only applied to the left-hand side of the + operator. Thanks to @ryantm for reporting the issue at: https://github.com/NixOS/nixpkgs/pull/46487/commits/c3612b97e625ad0d70c6ba56d191bcb9a403f44c#r220576764 Signed-off-by: aszlig <aszlig@nix.build> Reported-by: Ryan Mulligan <ryan@ryantm.com>
| * | arc-theme: 2017-05-12 -> 20180715 (#43490)rembo102018-09-26
| | |
| * | nfs-utils: 2.3.2 -> 2.3.3 (#46989)R. RyanTM2018-09-26
| | | | | | | | | | | | | | | | | | Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/nfs-utils/versions
| * | gitAndTools.pass-git-helper: init at 0.4 (#47056)vanzef2018-09-26
| | |
| * | linux: 4.18.9 -> 4.18.10Tim Steinbach2018-09-26
| | |
| * | linux: 4.14.71 -> 4.14.72Tim Steinbach2018-09-26
| | |
| * | linux: 4.9.128 -> 4.9.129Tim Steinbach2018-09-26
| | |
| * | linux: 4.4.157 -> 4.4.158Tim Steinbach2018-09-26
| | |
| * | postgresql: give postgres user a shellDomen Kožar2018-09-26
| | |
| * | nodejs-10_x: 10.9.0 -> 10.11.0Jasper Woudenberg2018-09-26
| | |
| * | google-compute-engine: 20180510 -> 20180905zimbatm2018-09-26
| | | | | | | | | | | | The list of corresponding NixOS services are also updated
| * | libsigrokdecode: 0.5.1 -> 0.5.2R. RyanTM2018-09-26
| | | | | | | | | | | | | | | | | | | | | Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libsigrokdecode/versions
| * | go-2fa: Init at 1.1.0Roman Volosatovs2018-09-26
| | |
| * | arpack: 3.5.0 -> 3.6.3R. RyanTM2018-09-26
| | | | | | | | | | | | | | | | | | | | | Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/arpack/versions
| * | Merge pull request #47326 from r-ryantm/auto-update/bibutilsJörg Thalheim2018-09-26
| |\ \ | | | | | | | | bibutils: 6.6 -> 6.7
| | * | bibutils: 6.6 -> 6.7R. RyanTM2018-09-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/bibutils/versions
| * | | stdenv: partial revert of f2bb59Matthew Bauer2018-09-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /cc @Ericson2314 This line broke MacOS cross compilation. paxctl cannot be built on macOS. Maybe it can be fixed, but no reason to break things unnecessarily. Regardless, you definitely need to be more careful about backporting. I think it’s fine to move fast and break things on master but with release-18.09 we should be more careful. Something like more automated testing for cross compilation would also be helpful (hopefully even making it block).
| * | | net_snmp: build with default perl (#47373)volth2018-09-26
| | | |
| * | | Merge pull request #47365 from dtzWill/feature/matrix-clientsWill Dietz2018-09-25
| |\ \ \ | | | | | | | | | | spectral: init at 2018-09-24; nheko: 0.5.0 -> 0.6.0 and bump dep mtxclient
| | * | | spectral: init at 2018-09-24Will Dietz2018-09-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * needs at least qtgraphicaleffects not mentioned in docs * doesn't want to use our libqmatrixclient, so let it use bundled * took a few runs (or perhaps just patience with one) to populate, when my profile icon appeared it seemed ready-- then click it to see list of rooms and such.
| | * | | mtxclient: 0.1.0 -> 0.2.0Will Dietz2018-09-25
| | | | |
| | * | | nheko: 0.5.5 -> 0.6.0Will Dietz2018-09-25
| | | | |
| * | | | Merge reording asserts in NixOS eval (#47293)aszlig2018-09-26
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes the evaluation order in that it evaluates assertions before warnings, so that eg. the following would work: { config, lib, ... }: { options.foo = lib.mkOption { type = lib.types.bool; default = true; description = "..."; }; options.bar = lib.mkOption { type = lib.types.bool; default = false; description = "..."; }; config = lib.mkMerge [ (lib.mkIf config.bar { system.build.bar = "foobar"; }) (lib.mkIf config.foo { assertions = lib.singleton { assertion = config.bar; message = "Bar needs to be enabled"; }; systemd.services.foo = { description = "Foo"; serviceConfig.ExecStart = config.system.build.bar; }; }) ]; } This is because the systemd module includes definitions for warnings that would trigger evaluation of the config.system.build.bar definition. The original pull request references a breakage due to the following: { services.nixosManual.enable = false; services.nixosManual.showManual = true; } However, changing the eval order between asserts and warnings clearly is a corner case here and it only happens because of the aforementioned usage of warnings in the systemd module and needs more discussion. Nevertheless, this is still useful because it lowers the evaluation time whenever an assertion is hit, which is a hard failure anyway.
| | * | | | nixos: top-level: indentJan Malakhovski2018-09-24
| | | | | |
| | * | | | nixos: top-level: evaluate assertions before warningsJan Malakhovski2018-09-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | or else at least the following config will fail with an evaluation error instead of an assert ``` { services.nixosManual.enable = false; services.nixosManual.showManual = true; } ```
| * | | | | Merge pull request #47358 from volth/perl-devxeji2018-09-26
| |\ \ \ \ \ | | | | | | | | | | | | | | perl: add devel version at 5.29.3
| | * | | | | perldevel: use double quote to preserve ''\.''volth2018-09-25
| | | | | | |
| | * | | | | perl: add devel version at 5.29.3volth2018-09-25
| | | | | | |
| * | | | | | Merge pull request #47322 from r-ryantm/auto-update/aceJörg Thalheim2018-09-25
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | ace: 6.5.1 -> 6.5.2
| | * | | | | | ace: 6.5.1 -> 6.5.2R. RyanTM2018-09-25
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/ace/versions
| * | | | | | Merge pull request #47343 from dywedir/cargo-editJörg Thalheim2018-09-25
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | cargo-edit: 0.3.0 -> 0.3.1
| | * | | | | | cargo-edit: 0.3.0 -> 0.3.1Vladyslav Mykhailichenko2018-09-25
| | | | | | | |
| * | | | | | | Merge pull request #47319 from r-ryantm/auto-update/cadvisorJörg Thalheim2018-09-25
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | cadvisor: 0.30.2 -> 0.31.0
| | * | | | | | | cadvisor: 0.30.2 -> 0.31.0R. RyanTM2018-09-25
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cadvisor/versions
| * | | | | | | Merge pull request #47333 from r-ryantm/auto-update/alembicJörg Thalheim2018-09-25
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | alembic: 1.7.8 -> 1.7.9
| | * | | | | | | alembic: 1.7.8 -> 1.7.9R. RyanTM2018-09-25
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/alembic/versions
| * | | | | | | Merge pull request #47337 from r-ryantm/auto-update/apktoolJörg Thalheim2018-09-25
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | apktool: 2.3.3 -> 2.3.4
| | * | | | | | | apktool: 2.3.3 -> 2.3.4R. RyanTM2018-09-25
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/apktool/versions
| * | | | | | | Merge pull request #47336 from r-ryantm/auto-update/brightnessctlJörg Thalheim2018-09-25
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | brightnessctl: 0.3.2 -> 0.4
| | * | | | | | | brightnessctl: 0.3.2 -> 0.4R. RyanTM2018-09-25
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/brightnessctl/versions
| * | | | | | | Merge pull request #47338 from r-ryantm/auto-update/cb2bibJörg Thalheim2018-09-25
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | cb2bib: 1.9.8 -> 1.9.9
| | * | | | | | | cb2bib: 1.9.8 -> 1.9.9R. RyanTM2018-09-25
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/cb2bib/versions
| * | | | | | | Merge pull request #47341 from r-ryantm/auto-update/batctlJörg Thalheim2018-09-25
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | batctl: 2018.2 -> 2018.3
| | * | | | | | | batctl: 2018.2 -> 2018.3R. RyanTM2018-09-25
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/batctl/versions
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-07-08 23:47:26 +0000