about summary refs log tree commit diff
Commit message (Expand)AuthorAge
* bash: 4.4p5 -> 4.4p12Eelco Dolstra2017-03-20
* Merge pull request #24121 from NixOS/fix-darwin-ssl-23605Eelco Dolstra2017-03-20
|\
| * git, openssl, curl: Respect $NIX_SSL_CERT_FILEDomen Kožar2017-03-20
|/
* Merge remote-tracking branch 'upstream/master' into stagingTuomas Tynkkynen2017-03-20
|\
| * Merge pull request #24107 from calvertvl/update-srcDaniel Peebles2017-03-20
| |\
| | * src: wrap to properly resolve rcs at runtimeVictor Calvert2017-03-20
| | * src: 1.11 -> 1.12Victor Calvert2017-03-20
| | * Adding self as maintainerVictor Calvert2017-03-20
| |/
| * release.nix: Don't block release on aarch64 failuresTuomas Tynkkynen2017-03-20
| * Merge pull request #24103 from ebzzry/emem-0.2.45ndowens2017-03-19
| |\
| | * emem: 0.2.44 -> 0.2.45Rommel M. Martinez2017-03-20
| * | Merge pull request #24102 from ndowens/copyqndowens2017-03-19
| |\ \
| | * | copyq: 2.5.0 -> 2.9.0ndowens2017-03-19
| * | | Merge pull request #24100 from ndowens/devilspie2ndowens2017-03-19
| |\ \ \
| | * | | devilspie2: 0.39 -> 0.42ndowens2017-03-19
| | |/ /
| * | | Merge pull request #24092 from ebzzry/emem-0.2.44ndowens2017-03-19
| |\ \ \ | | | |/ | | |/|
| | * | emem: 0.2.43 -> 0.2.44Rommel M. Martinez2017-03-20
| * | | Merge pull request #24098 from ndowens/sigilndowens2017-03-19
| |\ \ \ | | |_|/ | |/| |
| | * | sigil: 0.9.6 -> 0.9.7ndowens2017-03-19
| * | | Merge pull request #24097 from ndowens/chirpndowens2017-03-19
| |\ \ \
| | * | | chirp: 20161018 -> 20170311ndowens2017-03-19
| * | | | Merge pull request #24095 from NixOS/revert-24094-chirpndowens2017-03-19
| |\ \ \ \
| | * | | | Revert "chirp: 20161018 -> 20170311"ndowens2017-03-19
| |/ / / /
| * | | | Merge pull request #24094 from ndowens/chirpndowens2017-03-19
| |\ \ \ \
| | * | | | chirp: 20161018 -> 20170311ndowens2017-03-19
| | |/ / /
| * | | | Merge pull request #23903 from mbrgm/upgrade-inspectrumJoachim F2017-03-20
| |\ \ \ \
| | * | | | inspectrum: 20160403 -> 20170218Marius Bergmann2017-03-14
| | * | | | liquid-dsp: init at 20170307Marius Bergmann2017-03-14
| * | | | | Merge pull request #24089 from shanemikel/script_nix-diff.shDaiderd Jordan2017-03-20
| |\ \ \ \ \
| | * | | | | nix-diff.sh maintainer script: update usage message for new flagsShane Pearlman2017-03-19
| * | | | | | Merge pull request #23817 from orivej/objconvndowens2017-03-19
| |\ \ \ \ \ \
| | * | | | | | objconv: 2.16 -> 2.44Orivej Desh2017-03-19
| * | | | | | | Merge pull request #24088 from ndowens/tiledndowens2017-03-19
| |\ \ \ \ \ \ \
| | * | | | | | | tiled: 0.17.0 -> 0.18.2ndowens2017-03-19
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Merge pull request #24087 from ndowens/calcursendowens2017-03-19
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | calcurse: 4.0.0 -> 4.2.2ndowens2017-03-19
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge pull request #24082 from dtzWill/fix/neo4j-and-updateJoachim F2017-03-20
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | neo4j service: neo4j-wrapper is deprecated, merge into neo4j.confWill Dietz2017-03-19
| | * | | | | neo4j service: fix package installed into env to match running serviceWill Dietz2017-03-19
| | * | | | | neo4j: 3.1.1 -> 3.1.2Will Dietz2017-03-19
| * | | | | | Merge pull request #24086 from dtzWill/fix/lldb-toplevelJörg Thalheim2017-03-20
| |\ \ \ \ \ \
| | * | | | | | Add top-level attr for lldb_4Will Dietz2017-03-19
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #23414 from shanemikel/nix-helper-scriptsDaiderd Jordan2017-03-20
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | nix-diff.sh maintainer script: "diffs" Nix environment generationsShane Pearlman2017-03-19
| * | | | | | Merge pull request #24079 from ndowens/nanoTim Steinbach2017-03-19
| |\ \ \ \ \ \
| | * | | | | | nano: 2.7.3 -> 2.7.5ndowens2017-03-19
| * | | | | | | Merge pull request #24084 from ndowens/scitendowens2017-03-19
| |\ \ \ \ \ \ \
| | * | | | | | | scite: 3.3.7 -> 3.7.3; Cosmetic changesndowens2017-03-19
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge pull request #24083 from ndowens/neditndowens2017-03-19
| |\ \ \ \ \ \ \
| | * | | | | | | nedit: 5.6a -> 5.7ndowens2017-03-19
| | |/ / / / / /