Merge master into staging-next
This commit is contained in:
github-actions[bot]
GitHub
commit
c7f86a0032
@ -2561,6 +2561,12 @@
|
||||
}
|
||||
];
|
||||
};
|
||||
CaitlinDavitt = {
|
||||
email = "CaitlinDavitt@gmail.com";
|
||||
github = "CaitlinDavitt";
|
||||
githubId = 48105979;
|
||||
name = "Caitlin Davitt";
|
||||
};
|
||||
calavera = {
|
||||
email = "david.calavera@gmail.com";
|
||||
github = "calavera";
|
||||
|
||||
@ -42,10 +42,7 @@ let
|
||||
xserverEnabled = config.services.xserver.enable;
|
||||
};
|
||||
|
||||
nixos-option =
|
||||
if lib.versionAtLeast (lib.getVersion config.nix.package) "2.4pre"
|
||||
then null
|
||||
else pkgs.nixos-option;
|
||||
inherit (pkgs) nixos-option;
|
||||
|
||||
nixos-version = makeProg {
|
||||
name = "nixos-version";
|
||||
@ -232,9 +229,10 @@ in
|
||||
nixos-install
|
||||
nixos-rebuild
|
||||
nixos-generate-config
|
||||
nixos-option
|
||||
nixos-version
|
||||
nixos-enter
|
||||
] ++ lib.optional (nixos-option != null) nixos-option;
|
||||
];
|
||||
|
||||
documentation.man.man-db.skipPackages = [ nixos-version ];
|
||||
|
||||
|
||||
@ -40,7 +40,7 @@ in
|
||||
(cfg.configFile != null)
|
||||
''-c "${cfg.configFile}"''
|
||||
;
|
||||
in "${cfg.package}/bin/herbstluftwm ${configFileClause}";
|
||||
in "${cfg.package}/bin/herbstluftwm ${configFileClause} &";
|
||||
};
|
||||
environment.systemPackages = [ cfg.package ];
|
||||
};
|
||||
|
||||
@ -17,13 +17,13 @@
|
||||
],
|
||||
"builds": {
|
||||
"223.8836.1185": "https://plugins.jetbrains.com/files/164/275091/IdeaVim-2.1.0.zip",
|
||||
"231.9011.31": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
|
||||
"231.9011.34": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
|
||||
"231.9011.35": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
|
||||
"231.9011.38": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
|
||||
"231.9011.39": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
|
||||
"231.9011.41": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
|
||||
"231.9161.38": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip"
|
||||
"231.9161.29": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
|
||||
"231.9161.38": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
|
||||
"231.9161.40": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
|
||||
"231.9161.41": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
|
||||
"231.9161.46": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip",
|
||||
"231.9161.47": "https://plugins.jetbrains.com/files/164/347833/IdeaVim-2.3.0-signed.zip"
|
||||
},
|
||||
"name": "ideavim"
|
||||
},
|
||||
@ -42,7 +42,7 @@
|
||||
"idea-ultimate"
|
||||
],
|
||||
"builds": {
|
||||
"231.9161.38": null
|
||||
"231.9161.38": "https://plugins.jetbrains.com/files/6954/357005/kotlin-plugin-231-1.9.0-release-358-IJ8770.65.zip"
|
||||
},
|
||||
"name": "kotlin"
|
||||
},
|
||||
@ -63,13 +63,13 @@
|
||||
],
|
||||
"builds": {
|
||||
"223.8836.1185": null,
|
||||
"231.9011.31": "https://plugins.jetbrains.com/files/6981/336613/ini-231.9011.41.zip",
|
||||
"231.9011.34": "https://plugins.jetbrains.com/files/6981/336613/ini-231.9011.41.zip",
|
||||
"231.9011.35": "https://plugins.jetbrains.com/files/6981/336613/ini-231.9011.41.zip",
|
||||
"231.9011.38": "https://plugins.jetbrains.com/files/6981/336613/ini-231.9011.41.zip",
|
||||
"231.9011.39": "https://plugins.jetbrains.com/files/6981/336613/ini-231.9011.41.zip",
|
||||
"231.9011.41": "https://plugins.jetbrains.com/files/6981/336613/ini-231.9011.41.zip",
|
||||
"231.9161.38": "https://plugins.jetbrains.com/files/6981/351503/ini-231.9161.47.zip"
|
||||
"231.9161.29": "https://plugins.jetbrains.com/files/6981/351503/ini-231.9161.47.zip",
|
||||
"231.9161.38": "https://plugins.jetbrains.com/files/6981/351503/ini-231.9161.47.zip",
|
||||
"231.9161.40": "https://plugins.jetbrains.com/files/6981/351503/ini-231.9161.47.zip",
|
||||
"231.9161.41": "https://plugins.jetbrains.com/files/6981/351503/ini-231.9161.47.zip",
|
||||
"231.9161.46": "https://plugins.jetbrains.com/files/6981/351503/ini-231.9161.47.zip",
|
||||
"231.9161.47": "https://plugins.jetbrains.com/files/6981/351503/ini-231.9161.47.zip"
|
||||
},
|
||||
"name": "ini"
|
||||
},
|
||||
@ -81,10 +81,10 @@
|
||||
"rider"
|
||||
],
|
||||
"builds": {
|
||||
"231.9011.34": "https://plugins.jetbrains.com/files/7322/326457/python-ce-231.8770.65.zip",
|
||||
"231.9011.35": "https://plugins.jetbrains.com/files/7322/326457/python-ce-231.8770.65.zip",
|
||||
"231.9011.39": "https://plugins.jetbrains.com/files/7322/326457/python-ce-231.8770.65.zip",
|
||||
"231.9161.38": "https://plugins.jetbrains.com/files/7322/326457/python-ce-231.8770.65.zip"
|
||||
"231.9161.38": "https://plugins.jetbrains.com/files/7322/326457/python-ce-231.8770.65.zip",
|
||||
"231.9161.41": "https://plugins.jetbrains.com/files/7322/326457/python-ce-231.8770.65.zip",
|
||||
"231.9161.46": "https://plugins.jetbrains.com/files/7322/326457/python-ce-231.8770.65.zip"
|
||||
},
|
||||
"name": "python-community-edition"
|
||||
},
|
||||
@ -105,13 +105,13 @@
|
||||
],
|
||||
"builds": {
|
||||
"223.8836.1185": "https://plugins.jetbrains.com/files/8182/329558/intellij-rust-0.4.194.5382-223.zip",
|
||||
"231.9011.31": "https://plugins.jetbrains.com/files/8182/346574/intellij-rust-0.4.196.5423-231.zip",
|
||||
"231.9011.34": "https://plugins.jetbrains.com/files/8182/346574/intellij-rust-0.4.196.5423-231.zip",
|
||||
"231.9011.35": "https://plugins.jetbrains.com/files/8182/346574/intellij-rust-0.4.196.5423-231.zip",
|
||||
"231.9011.38": "https://plugins.jetbrains.com/files/8182/346574/intellij-rust-0.4.196.5423-231.zip",
|
||||
"231.9011.39": "https://plugins.jetbrains.com/files/8182/346574/intellij-rust-0.4.196.5423-231.zip",
|
||||
"231.9011.41": "https://plugins.jetbrains.com/files/8182/346574/intellij-rust-0.4.196.5423-231.zip",
|
||||
"231.9161.38": "https://plugins.jetbrains.com/files/8182/346574/intellij-rust-0.4.196.5423-231.zip"
|
||||
"231.9011.35": "https://plugins.jetbrains.com/files/8182/352612/intellij-rust-0.4.197.5401-231.zip",
|
||||
"231.9161.29": "https://plugins.jetbrains.com/files/8182/352612/intellij-rust-0.4.197.5401-231.zip",
|
||||
"231.9161.38": "https://plugins.jetbrains.com/files/8182/352612/intellij-rust-0.4.197.5401-231.zip",
|
||||
"231.9161.40": "https://plugins.jetbrains.com/files/8182/352612/intellij-rust-0.4.197.5401-231.zip",
|
||||
"231.9161.41": "https://plugins.jetbrains.com/files/8182/352612/intellij-rust-0.4.197.5401-231.zip",
|
||||
"231.9161.46": "https://plugins.jetbrains.com/files/8182/352612/intellij-rust-0.4.197.5401-231.zip",
|
||||
"231.9161.47": "https://plugins.jetbrains.com/files/8182/352612/intellij-rust-0.4.197.5401-231.zip"
|
||||
},
|
||||
"name": "rust"
|
||||
},
|
||||
@ -131,14 +131,14 @@
|
||||
"webstorm"
|
||||
],
|
||||
"builds": {
|
||||
"223.8836.1185": "https://plugins.jetbrains.com/files/8182/330017/intellij-rust-0.4.194.5384-223-beta.zip",
|
||||
"231.9011.31": "https://plugins.jetbrains.com/files/8182/351209/intellij-rust-0.4.197.5433-231-beta.zip",
|
||||
"231.9011.34": "https://plugins.jetbrains.com/files/8182/351209/intellij-rust-0.4.197.5433-231-beta.zip",
|
||||
"231.9011.35": "https://plugins.jetbrains.com/files/8182/351209/intellij-rust-0.4.197.5433-231-beta.zip",
|
||||
"231.9011.38": "https://plugins.jetbrains.com/files/8182/351209/intellij-rust-0.4.197.5433-231-beta.zip",
|
||||
"231.9011.39": "https://plugins.jetbrains.com/files/8182/351209/intellij-rust-0.4.197.5433-231-beta.zip",
|
||||
"231.9011.41": "https://plugins.jetbrains.com/files/8182/351209/intellij-rust-0.4.197.5433-231-beta.zip",
|
||||
"231.9161.38": "https://plugins.jetbrains.com/files/8182/351209/intellij-rust-0.4.197.5433-231-beta.zip"
|
||||
"223.8836.1185": null,
|
||||
"231.9011.35": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip",
|
||||
"231.9161.29": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip",
|
||||
"231.9161.38": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip",
|
||||
"231.9161.40": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip",
|
||||
"231.9161.41": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip",
|
||||
"231.9161.46": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip",
|
||||
"231.9161.47": "https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip"
|
||||
},
|
||||
"name": "rust-beta"
|
||||
},
|
||||
@ -153,11 +153,10 @@
|
||||
"webstorm"
|
||||
],
|
||||
"builds": {
|
||||
"231.9011.34": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip",
|
||||
"231.9011.35": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip",
|
||||
"231.9011.38": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip",
|
||||
"231.9011.41": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip",
|
||||
"231.9161.38": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip"
|
||||
"231.9161.29": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip",
|
||||
"231.9161.38": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip",
|
||||
"231.9161.40": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip",
|
||||
"231.9161.41": "https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip"
|
||||
},
|
||||
"name": "ide-features-trainer"
|
||||
},
|
||||
@ -178,13 +177,13 @@
|
||||
],
|
||||
"builds": {
|
||||
"223.8836.1185": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
|
||||
"231.9011.31": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
|
||||
"231.9011.34": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
|
||||
"231.9011.35": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
|
||||
"231.9011.38": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
|
||||
"231.9011.39": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
|
||||
"231.9011.41": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
|
||||
"231.9161.38": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip"
|
||||
"231.9161.29": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
|
||||
"231.9161.38": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
|
||||
"231.9161.40": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
|
||||
"231.9161.41": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
|
||||
"231.9161.46": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip",
|
||||
"231.9161.47": "https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip"
|
||||
},
|
||||
"name": "nixidea"
|
||||
},
|
||||
@ -214,13 +213,13 @@
|
||||
],
|
||||
"builds": {
|
||||
"223.8836.1185": "https://plugins.jetbrains.com/files/10037/332761/CSVEditor-3.2.0-223.zip",
|
||||
"231.9011.31": "https://plugins.jetbrains.com/files/10037/332760/CSVEditor-3.2.0-231.zip",
|
||||
"231.9011.34": "https://plugins.jetbrains.com/files/10037/332760/CSVEditor-3.2.0-231.zip",
|
||||
"231.9011.35": "https://plugins.jetbrains.com/files/10037/332760/CSVEditor-3.2.0-231.zip",
|
||||
"231.9011.38": "https://plugins.jetbrains.com/files/10037/332760/CSVEditor-3.2.0-231.zip",
|
||||
"231.9011.39": "https://plugins.jetbrains.com/files/10037/332760/CSVEditor-3.2.0-231.zip",
|
||||
"231.9011.41": "https://plugins.jetbrains.com/files/10037/332760/CSVEditor-3.2.0-231.zip",
|
||||
"231.9161.38": "https://plugins.jetbrains.com/files/10037/332760/CSVEditor-3.2.0-231.zip"
|
||||
"231.9161.29": "https://plugins.jetbrains.com/files/10037/332760/CSVEditor-3.2.0-231.zip",
|
||||
"231.9161.38": "https://plugins.jetbrains.com/files/10037/332760/CSVEditor-3.2.0-231.zip",
|
||||
"231.9161.40": "https://plugins.jetbrains.com/files/10037/332760/CSVEditor-3.2.0-231.zip",
|
||||
"231.9161.41": "https://plugins.jetbrains.com/files/10037/332760/CSVEditor-3.2.0-231.zip",
|
||||
"231.9161.46": "https://plugins.jetbrains.com/files/10037/332760/CSVEditor-3.2.0-231.zip",
|
||||
"231.9161.47": "https://plugins.jetbrains.com/files/10037/332760/CSVEditor-3.2.0-231.zip"
|
||||
},
|
||||
"name": "csv-editor"
|
||||
},
|
||||
@ -241,13 +240,13 @@
|
||||
],
|
||||
"builds": {
|
||||
"223.8836.1185": "https://plugins.jetbrains.com/files/12559/257029/keymap-eclipse-223.7571.125.zip",
|
||||
"231.9011.31": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
|
||||
"231.9011.34": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
|
||||
"231.9011.35": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
|
||||
"231.9011.38": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
|
||||
"231.9011.39": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
|
||||
"231.9011.41": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
|
||||
"231.9161.38": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip"
|
||||
"231.9161.29": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
|
||||
"231.9161.38": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
|
||||
"231.9161.40": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
|
||||
"231.9161.41": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
|
||||
"231.9161.46": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip",
|
||||
"231.9161.47": "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip"
|
||||
},
|
||||
"name": "eclipse-keymap"
|
||||
},
|
||||
@ -268,13 +267,13 @@
|
||||
],
|
||||
"builds": {
|
||||
"223.8836.1185": "https://plugins.jetbrains.com/files/13017/257030/keymap-visualStudio-223.7571.125.zip",
|
||||
"231.9011.31": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
|
||||
"231.9011.34": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
|
||||
"231.9011.35": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
|
||||
"231.9011.38": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
|
||||
"231.9011.39": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
|
||||
"231.9011.41": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
|
||||
"231.9161.38": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip"
|
||||
"231.9161.29": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
|
||||
"231.9161.38": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
|
||||
"231.9161.40": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
|
||||
"231.9161.41": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
|
||||
"231.9161.46": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip",
|
||||
"231.9161.47": "https://plugins.jetbrains.com/files/13017/307831/keymap-visualStudio-231.8109.91.zip"
|
||||
},
|
||||
"name": "visual-studio-keymap"
|
||||
},
|
||||
@ -295,13 +294,13 @@
|
||||
],
|
||||
"builds": {
|
||||
"223.8836.1185": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"231.9011.31": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"231.9011.34": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"231.9011.35": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"231.9011.38": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"231.9011.39": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"231.9011.41": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"231.9161.38": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar"
|
||||
"231.9161.29": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"231.9161.38": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"231.9161.40": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"231.9161.41": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"231.9161.46": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
|
||||
"231.9161.47": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar"
|
||||
},
|
||||
"name": "darcula-pitch-black"
|
||||
},
|
||||
@ -322,13 +321,13 @@
|
||||
],
|
||||
"builds": {
|
||||
"223.8836.1185": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
|
||||
"231.9011.31": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
|
||||
"231.9011.34": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
|
||||
"231.9011.35": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
|
||||
"231.9011.38": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
|
||||
"231.9011.39": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
|
||||
"231.9011.41": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
|
||||
"231.9161.38": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip"
|
||||
"231.9161.29": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
|
||||
"231.9161.38": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
|
||||
"231.9161.40": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
|
||||
"231.9161.41": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
|
||||
"231.9161.46": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip",
|
||||
"231.9161.47": "https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip"
|
||||
},
|
||||
"name": "github-copilot"
|
||||
},
|
||||
@ -349,13 +348,13 @@
|
||||
],
|
||||
"builds": {
|
||||
"223.8836.1185": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"231.9011.31": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"231.9011.34": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"231.9011.35": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"231.9011.38": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"231.9011.39": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"231.9011.41": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"231.9161.38": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip"
|
||||
"231.9161.29": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"231.9161.38": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"231.9161.40": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"231.9161.41": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"231.9161.46": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
|
||||
"231.9161.47": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip"
|
||||
},
|
||||
"name": "netbeans-6-5-keymap"
|
||||
}
|
||||
@ -373,13 +372,13 @@
|
||||
"https://plugins.jetbrains.com/files/17718/351707/github-copilot-intellij-1.2.9.2684.zip": "sha256-imh+3U+HWM9jia2HfRXInHl1pfw+T6D4ls3DGqbqbsw=",
|
||||
"https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=",
|
||||
"https://plugins.jetbrains.com/files/631/350772/python-231.9161.38.zip": "sha256-vQfCR7WMrknRminRcd0AoGrxofAf5dcD8/aXLwWBo3k=",
|
||||
"https://plugins.jetbrains.com/files/6954/357005/kotlin-plugin-231-1.9.0-release-358-IJ8770.65.zip": "sha256-v2EB05au8mkC5VnoEILLJ3tesEeCWCYSNJ9RzfJZA1o=",
|
||||
"https://plugins.jetbrains.com/files/6981/336613/ini-231.9011.41.zip": "sha256-PtBDN+FNA518HaewPIr9pq5S3Z9RGSCA2NT+YnZ0l8c=",
|
||||
"https://plugins.jetbrains.com/files/6981/351503/ini-231.9161.47.zip": "sha256-oAgTPyTnfqEKjaGcK50k9O16hDY+A4lfL2l9IpGKyCY=",
|
||||
"https://plugins.jetbrains.com/files/7322/326457/python-ce-231.8770.65.zip": "sha256-LjHpwdBtC4C9KXrHQ+EvmGL1A+Tfbqzc17Kf80SP/lE=",
|
||||
"https://plugins.jetbrains.com/files/8182/329558/intellij-rust-0.4.194.5382-223.zip": "sha256-AgaKH4ZaxLhumk1P9BVJGpvluKnpYIulCDIRQpaWlKA=",
|
||||
"https://plugins.jetbrains.com/files/8182/330017/intellij-rust-0.4.194.5384-223-beta.zip": "sha256-+iYFqpc4Qn+KGWX3IXpM1sHQV+IPYJZBLFNo0kdx8oE=",
|
||||
"https://plugins.jetbrains.com/files/8182/346574/intellij-rust-0.4.196.5423-231.zip": "sha256-dyJc5O06QLNLQ/D1tX9cGRLqalPX4prcRXz0WcD2RU4=",
|
||||
"https://plugins.jetbrains.com/files/8182/351209/intellij-rust-0.4.197.5433-231-beta.zip": "sha256-P/8tr5n8yVFFTLB4ML2tobJqeuxHWkkEargMjVpnF2Y=",
|
||||
"https://plugins.jetbrains.com/files/8182/352612/intellij-rust-0.4.197.5401-231.zip": "sha256-Xi4gleut5anlXpiUHfsc41tvq2kOR4v63mHk+ovmTw8=",
|
||||
"https://plugins.jetbrains.com/files/8182/355173/intellij-rust-0.4.198.5444-231-beta.zip": "sha256-OuOUVUYHfg5JFLX2xAQ/VHaS8gUI0H7SZEdau8fbAAY=",
|
||||
"https://plugins.jetbrains.com/files/8554/326468/featuresTrainer-231.8770.66.zip": "sha256-N5woM9O9y+UequeWcjCLL93rjHDW0Tnvh8h3iLrwmjk=",
|
||||
"https://plugins.jetbrains.com/files/8607/318851/NixIDEA-0.4.0.9.zip": "sha256-byShwSfnAG8kXhoNu7CfOwvy4Viav784NT0UmzKY6hQ=",
|
||||
"https://plugins.jetbrains.com/files/9568/343928/go-plugin-231.9161.14.zip": "sha256-67SuJKJZEzEYojsL33zvtWArvADkkjd643cVb4s9EUk="
|
||||
|
||||
@ -14,19 +14,19 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "drawio";
|
||||
version = "21.5.0";
|
||||
version = "21.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jgraph";
|
||||
repo = "drawio-desktop";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-Eh3QRVeWd/RDEBnuYpFeNF96bt7bGpNkNFwWaTdYeCE=";
|
||||
hash = "sha256-60fOecWDYGkn4rJzxmum14L4IAaHAG+uKyjNo9nkVHg=";
|
||||
};
|
||||
|
||||
offlineCache = fetchYarnDeps {
|
||||
yarnLock = src + "/yarn.lock";
|
||||
hash = "sha256-PcE3PhK4jIRx089A8nnZBvYwWpjeTtGFwAMGwbfVS5E=";
|
||||
hash = "sha256-Knk9ys8Kjk1QOl80vmIA2H6wP8Mj6iNcmb/bR4zMQgw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mediainfo";
|
||||
version = "23.04";
|
||||
version = "23.06";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
|
||||
sha256 = "sha256-Uiut1rHk6LV+giW6e0nvgn35ffTLaLbU/HkQ92xf32k=";
|
||||
sha256 = "sha256-TJd+6wzoN4co5k7yTyf+YrLFEW+/BUHIJKRDCfgP+Io=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook pkg-config ];
|
||||
|
||||
@ -1,20 +1,20 @@
|
||||
{
|
||||
stable = import ./browser.nix {
|
||||
channel = "stable";
|
||||
version = "113.0.1774.50";
|
||||
version = "114.0.1823.79";
|
||||
revision = "1";
|
||||
sha256 = "sha256-5QKIVh/y3CBPlWUbrudvC2NHfJGB5nGsu/4tUfCOCYM=";
|
||||
sha256 = "sha256-FyEsIGwGDzX22scKd8L67uw5ipqN1e9CrC+qACRBZRg=";
|
||||
};
|
||||
beta = import ./browser.nix {
|
||||
channel = "beta";
|
||||
version = "114.0.1823.24";
|
||||
version = "115.0.1901.165";
|
||||
revision = "1";
|
||||
sha256 = "sha256-AT3jkuNXcVoKx98BJtONm06oO/kUyV0E7DVvkzPOfGE=";
|
||||
sha256 = "sha256-2DUWkGItissLGtJAMDKHNjMDPhsYNKaQVJ30+tMlkow=";
|
||||
};
|
||||
dev = import ./browser.nix {
|
||||
channel = "dev";
|
||||
version = "115.0.1851.0";
|
||||
version = "116.0.1938.10";
|
||||
revision = "1";
|
||||
sha256 = "sha256-PmfMe+B/JtvPhBGhQBUgoWjhKokTwCdG9y+GYl0VCMk=";
|
||||
sha256 = "sha256-NQXaLmX8AtLEWPkkzAA90XfmFflwulxVRHtIJ+nxCk4=";
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "circumflex";
|
||||
version = "3.1.3";
|
||||
version = "3.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bensadeh";
|
||||
repo = "circumflex";
|
||||
rev = version;
|
||||
hash = "sha256-KY3Jf0Y6ZAQciwImv7Oz0nQ5eEwm7XwOlAx3ijqDF0k=";
|
||||
hash = "sha256-3cu5Y9Z20CbFN+4/2LLM3pcXofuc8oztoZVPhDzFLas=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-ms7TvCXQdkrlWp1pGj3ja+ACodt7z6sP3E373xHxA34=";
|
||||
vendorHash = "sha256-w9WDbNvnaRgZ/rpI450C7AA244AXRE8u960xZnAiXn4=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
||||
@ -2,26 +2,31 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "helm-s3";
|
||||
version = "0.10.0";
|
||||
version = "0.14.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "hypnoglow";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2BQ/qtoL+iFbuLvrJGUuxWFKg9u1sVDRcRm2/S0mgyc=";
|
||||
sha256 = "sha256-81Rzqu2fj6xSZbKvAhHzaGnr/3ACZvqJhYe+6Vyc0qk=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-/9TiY0XdkiNxW5JYeC5WD9hqySCyYYU8lB+Ft5Vm96I=";
|
||||
vendorSha256 = "sha256-Jvfl0sdZXV497RIgoZUJD0zK/pXK6yeAnuSdq42nky8=";
|
||||
|
||||
# NOTE: Remove the install and upgrade hooks.
|
||||
postPatch = ''
|
||||
sed -i '/^hooks:/,+2 d' plugin.yaml
|
||||
'';
|
||||
|
||||
# NOTE: make test-unit, but skip awsutil, which needs internet access
|
||||
checkPhase = ''
|
||||
make test-unit
|
||||
go test $(go list ./... | grep -vE '(awsutil|e2e)')
|
||||
'';
|
||||
|
||||
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
|
||||
|
||||
subPackages = [ "cmd/helm-s3" ];
|
||||
|
||||
postInstall = ''
|
||||
install -dm755 $out/${pname}
|
||||
mv $out/bin $out/${pname}/
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "kaniko";
|
||||
version = "1.12.0";
|
||||
version = "1.12.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "GoogleContainerTools";
|
||||
repo = "kaniko";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-wDIkQ6MY9g8uKCgfJfXsjkB4blF0QNKIKDN3rYHOa6E=";
|
||||
hash = "sha256-RMkIqz0k/5XWa/QjmjBCst4od4mzR9KTCLZrI/HYtMk=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -6,14 +6,14 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gossa";
|
||||
version = "0.2.2";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pldubouilh";
|
||||
repo = "gossa";
|
||||
rev = "v${version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-eMO9aoI+otGQcvBUJtxciQ7yhUidYizLrDjMVchH3qA=";
|
||||
hash = "sha256-vonhVxXbYI/5Gl9ZwI8+a3YXSjoqLVic1twykiy+e34=";
|
||||
};
|
||||
|
||||
vendorHash = null;
|
||||
|
||||
@ -3,16 +3,16 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "elan";
|
||||
version = "1.4.6";
|
||||
version = "2.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "leanprover";
|
||||
repo = "elan";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-+GCmPT7dtd+XvmJv19XllZ6G4rB0+CYUt+lorr44aEQ=";
|
||||
sha256 = "sha256-97gkBViNIqs03JuPlUOyE/X3UKzF5KVZBKH3JnXw37E=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-iWZutcYyBVujwjMHFUwwE/xDk6o5tPng1ZQ2mHgTbVk=";
|
||||
cargoHash = "sha256-9aLCElsoWTUsuy+muhCcgo/1xmRYsbQDvhRa5YsV3lM=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config makeWrapper ];
|
||||
|
||||
|
||||
@ -10,14 +10,14 @@
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "dvc";
|
||||
version = "3.4.0";
|
||||
version = "3.5.0";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "iterative";
|
||||
repo = pname;
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-dFwcVktK9EKKuAbY0xhRxtpCPld9+gFHnTd8wSmt1+4=";
|
||||
hash = "sha256-AQE8KQ5j/EgN1P2HFghWXgQJbBc+KYu8kwNeV0Tktho=";
|
||||
};
|
||||
|
||||
pythonRelaxDeps = [
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "gh";
|
||||
version = "2.31.0";
|
||||
version = "2.32.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cli";
|
||||
repo = "cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-HZ64Dz2vluRkrwOe1oXwBm/hATsqxlFq4VC9L758cwE=";
|
||||
hash = "sha256-YnIwrx/NEOH3yXkkCq30i9Jt2IXKX5IX8BuM6+u9tvs=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-eq/2w16KL2Mrt7jZJStRFosLVpw6qfnGLAhes0iZAdg=";
|
||||
vendorHash = "sha256-fbf5EKDISdptbiJipvqygfjGWAP6fPXbYsgxVq8eUnM=";
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
|
||||
@ -1,26 +1,17 @@
|
||||
{ lib, buildGoModule, fetchFromGitHub, fetchpatch, installShellFiles, git, testers, git-town, makeWrapper }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles, git, testers, git-town, makeWrapper }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "git-town";
|
||||
version = "7.8.0";
|
||||
version = "9.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "git-town";
|
||||
repo = "git-town";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-g9ooMIMN8DN2FcWYkDC1hICCleQYdHf30PYMCit/NMI=";
|
||||
hash = "sha256-huo0PRqc2iBBYXGBVdgtPJhbPoIqqjN2loXQ3CqVaOA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
# Fix "go vet" when building using Go 1.18.
|
||||
(fetchpatch {
|
||||
name = "fix-go-vet-in-go-1.18.patch";
|
||||
url = "https://github.com/git-town/git-town/commit/23eb0aca7b28c6a0afc21db553aa0e35d35891aa.patch";
|
||||
sha256 = "sha256-EyfhKVrQxRJNrYqaZI04dJogaXs1J+bbOIu7p8g2Clc=";
|
||||
})
|
||||
];
|
||||
|
||||
vendorSha256 = null;
|
||||
vendorHash = null;
|
||||
|
||||
nativeBuildInputs = [ installShellFiles makeWrapper ];
|
||||
|
||||
|
||||
@ -12,13 +12,13 @@
|
||||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "ani-cli";
|
||||
version = "4.4";
|
||||
version = "4.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pystardust";
|
||||
repo = "ani-cli";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-eY5FXwNRSt4ZFnvMyPLEFnTazwsXOkuQ6zivCHD70YY=";
|
||||
hash = "sha256-HDpspU9OZxDET7/1rnKdGgaVEBt0gpzGtd3DuNIj7FY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
{ fetchFromGitHub, fetchgit, fetchHex, rebar3Relx, buildRebar3, rebar3-proper
|
||||
, stdenv, writeScript, lib, erlang }:
|
||||
let
|
||||
version = "0.47.1";
|
||||
version = "0.48.0";
|
||||
owner = "erlang-ls";
|
||||
repo = "erlang_ls";
|
||||
deps = import ./rebar-deps.nix {
|
||||
@ -24,7 +24,7 @@ rebar3Relx {
|
||||
inherit version;
|
||||
src = fetchFromGitHub {
|
||||
inherit owner repo;
|
||||
sha256 = "sha256-pW78CBOM0Yi5taPHdCfTTb9H1fbhuQFpf6jaf0cTQdA=";
|
||||
sha256 = "sha256-QwsN/P2FBuhIS/vRlrdvokQS6G77kkZ2Rg5rwNc36Jg=";
|
||||
rev = version;
|
||||
};
|
||||
releaseType = "escript";
|
||||
|
||||
@ -131,8 +131,8 @@ let
|
||||
src = fetchFromGitHub {
|
||||
owner = "josefs";
|
||||
repo = "gradualizer";
|
||||
rev = "6e89b4e1cd489637a848cc5ca55058c8a241bf7d";
|
||||
sha256 = "1ix0xgd0267ibx6y68fx4pq8q3j0y7rjs7j3cv3v2gdiy190psy9";
|
||||
rev = "3021d29d82741399d131e3be38d2a8db79d146d4";
|
||||
sha256 = "052f8x9x93yy00pbkl1745ffnwj3blcm39j12i4k166y1zbnwy00";
|
||||
};
|
||||
beamDeps = [ ];
|
||||
};
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "jsonnet";
|
||||
version = "0.20.0";
|
||||
outputs = ["out" "doc"];
|
||||
outputs = [ "out" "doc" ];
|
||||
|
||||
src = fetchFromGitHub {
|
||||
rev = "v${version}";
|
||||
@ -15,7 +15,16 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ jekyll cmake ];
|
||||
buildInputs = [ gtest ];
|
||||
|
||||
cmakeFlags = ["-DBUILD_STATIC_LIBS=ON" "-DUSE_SYSTEM_GTEST=ON" ];
|
||||
cmakeFlags = [
|
||||
"-DUSE_SYSTEM_GTEST=ON"
|
||||
"-DBUILD_STATIC_LIBS=${if stdenv.hostPlatform.isStatic then "ON" else "OFF"}"
|
||||
"-DBUILD_SHARED_BINARIES=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}"
|
||||
];
|
||||
|
||||
# https://github.com/google/jsonnet/issues/778
|
||||
patches = [
|
||||
./fix-cpp-unresolved-symbols.patch
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
|
||||
@ -0,0 +1,12 @@
|
||||
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
|
||||
index 3a52458..872e6c6 100644
|
||||
--- a/cpp/CMakeLists.txt
|
||||
+++ b/cpp/CMakeLists.txt
|
||||
@@ -10,6 +10,7 @@ set(LIBJSONNETPP_SOURCE
|
||||
|
||||
add_library(libjsonnet++ SHARED ${LIBJSONNETPP_HEADERS} ${LIBJSONNETPP_SOURCE})
|
||||
add_dependencies(libjsonnet++ jsonnet)
|
||||
+target_link_libraries(libjsonnet++ libjsonnet)
|
||||
# target_link_libraries(libjsonnet libjsonnet)
|
||||
|
||||
# CMake prepends CMAKE_SHARED_LIBRARY_PREFIX to shared libraries, so without
|
||||
@ -1,7 +1,7 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, llvmPackages_13
|
||||
, makeWrapper
|
||||
, makeBinaryWrapper
|
||||
, libiconv
|
||||
, MacOSX-SDK
|
||||
, which
|
||||
@ -12,17 +12,17 @@ let
|
||||
inherit (llvmPackages) stdenv;
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "odin";
|
||||
version = "dev-2023-05";
|
||||
version = "dev-2023-07";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "odin-lang";
|
||||
repo = "Odin";
|
||||
rev = version;
|
||||
sha256 = "sha256-qEewo2h4dpivJ7D4RxxBZbtrsiMJ7AgqJcucmanbgxY=";
|
||||
hash = "sha256-ksCK1Qmjbg5ZgFoq0I4cjrWaCxd+UW7f1NLcSjCPMwE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper which
|
||||
makeBinaryWrapper which
|
||||
];
|
||||
|
||||
buildInputs = lib.optional stdenv.isDarwin libiconv;
|
||||
@ -47,6 +47,8 @@ in stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
cp odin $out/bin/odin
|
||||
|
||||
@ -62,6 +64,8 @@ in stdenv.mkDerivation rec {
|
||||
lld
|
||||
])} \
|
||||
--set-default ODIN_ROOT $out/share
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@ -5,9 +5,10 @@ mkCoqDerivation rec {
|
||||
owner = "DeepSpec";
|
||||
inherit version;
|
||||
defaultVersion = with lib.versions; lib.switch coq.version [
|
||||
{ case = range "8.13" "8.17"; out = "5.1.0"; }
|
||||
{ case = range "8.13" "8.17"; out = "5.1.1"; }
|
||||
{ case = range "8.10" "8.16"; out = "4.0.0"; }
|
||||
] null;
|
||||
release."5.1.1".sha256 = "sha256-VlmPNwaGkdWrH7Z6DGXRosGtjuuQ+FBiGcadN2Hg5pY=";
|
||||
release."5.1.0".sha256 = "sha256-ny7Mi1KgWADiFznkNJiRgD7Djc5SUclNgKOmWRxK+eo=";
|
||||
release."4.0.0".sha256 = "0h5rhndl8syc24hxq1gch86kj7mpmgr89bxp2hmf28fd7028ijsm";
|
||||
releaseRev = v: "${v}";
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cjson";
|
||||
version = "1.7.15";
|
||||
version = "1.7.16";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DaveGamble";
|
||||
repo = "cJSON";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-PpUVsLklcs5hCCsQcsXw0oEVIWecKnQO16Hy0Ba8ov8=";
|
||||
sha256 = "sha256-sdhnDpaAO9Fau4uMzNXrbOJ2k0b8+MdhKh6rpFMUwaQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@ -14,14 +14,14 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hpp-fcl";
|
||||
version = "2.3.4";
|
||||
version = "2.3.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "humanoid-path-planner";
|
||||
repo = finalAttrs.pname;
|
||||
rev = "v${finalAttrs.version}";
|
||||
fetchSubmodules = true;
|
||||
hash = "sha256-tX8AvlR/Az8fFs4ylqFijw3hXiNRoEWffmYbTcaqO90=";
|
||||
hash = "sha256-jVIYP0yA1oSsUMN4vtrkfawj9Q2MwNjSrwDBTvGErg8=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "httplib";
|
||||
version = "0.12.6";
|
||||
version = "0.13.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "yhirose";
|
||||
repo = "cpp-httplib";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-7bH7bq6lsobf5ZEyxPXPqPopZyn9NKInlqmuNzmHkkM=";
|
||||
hash = "sha256-2vS8gdJrf7Iz6F5kyyWlr7zB1eBDjxdLesJcnkhg5eE=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
1252
pkgs/development/libraries/libdeltachat/Cargo.lock
generated
1252
pkgs/development/libraries/libdeltachat/Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@ -19,13 +19,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "libdeltachat";
|
||||
version = "1.117.0";
|
||||
version = "1.118.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "deltachat";
|
||||
repo = "deltachat-core-rust";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-zKOhjV2q+jKoh5KVb+izbRzq0kAFp3pXdnPTf9PAhGs=";
|
||||
hash = "sha256-1vkmz7LFG420zYETYIf3ayOQEPp+hz7Dr7gULz1nJOs=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -2,11 +2,11 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "wcslib";
|
||||
version = "7.12";
|
||||
version = "8.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-nPjeUOEJqX+gRRHUER6NFL0KRAdxMqz3PmzwAp/pa9Q=";
|
||||
sha256 = "sha256-K/I+b6vRC4rs/6VEMb8lqiJP8BnGCp5naqVlYfm0Ep4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ flex ];
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "clblast";
|
||||
version = "1.6.0";
|
||||
version = "1.6.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CNugteren";
|
||||
repo = "CLBlast";
|
||||
rev = version;
|
||||
hash = "sha256-eRwSfP6p0+9yql7TiXZsExRMcnnBLXXW2hh1JliYU2I=";
|
||||
hash = "sha256-1ddjmoLhFoLi/z2cae0HZidUTySsZQDk1T8MVPTbfi4=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "duppy";
|
||||
version = "0.9.2";
|
||||
version = "0.9.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "savonet";
|
||||
repo = "ocaml-duppy";
|
||||
rev = "v${version}";
|
||||
sha256 = "132dawca1p5s965m40ldmnihlpgfm47y62kfbzgim7sgsdwxxw5y";
|
||||
sha256 = "sha256-5U/CNQ88Wi/AgJEoFeS9O0zTPiD9ysJNQohRVJdyH9w=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ ocaml_pcre ];
|
||||
|
||||
@ -1,20 +1,23 @@
|
||||
{ buildPecl, zlib, lib }:
|
||||
{ buildPecl
|
||||
, zlib
|
||||
, lib
|
||||
}:
|
||||
|
||||
buildPecl {
|
||||
pname = "grpc";
|
||||
version = "1.56.0";
|
||||
|
||||
version = "1.50.0";
|
||||
sha256 = "sha256-Lgvrw1HZywfvHTaF88T5dtKXu/lGR5xeS+TsqqNQCSc=";
|
||||
sha256 = "sha256-uzxYMUzExMBDtwv3FipOuuUHg0v1wqAUtn69jXAQnf4=";
|
||||
|
||||
doCheck = true;
|
||||
checkTarget = "test";
|
||||
|
||||
nativeBuildInputs = [ zlib ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "A high performance, open source, general RPC framework that puts mobile and HTTP/2 first.";
|
||||
license = licenses.asl20;
|
||||
homepage = "https://github.com/grpc/grpc/tree/master/src/php/ext/grpc";
|
||||
maintainers = teams.php.members;
|
||||
license = lib.licenses.asl20;
|
||||
maintainers = lib.teams.php.members;
|
||||
};
|
||||
}
|
||||
|
||||
@ -2,18 +2,17 @@
|
||||
|
||||
buildPecl {
|
||||
pname = "igbinary";
|
||||
|
||||
version = "3.2.12";
|
||||
sha256 = "072qd4i22g0qmz0h1p6jhxx8rv0c8k7pgzwk52qfdijc0pgzz75n";
|
||||
version = "3.2.14";
|
||||
sha256 = "sha256-YzcUek+4iAclZmdIN72pko7gbufwEUtDOLhsgWIykl0=";
|
||||
|
||||
configureFlags = [ "--enable-igbinary" ];
|
||||
makeFlags = [ "phpincludedir=$(dev)/include" ];
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Binary serialization for PHP";
|
||||
license = licenses.bsd3;
|
||||
homepage = "https://github.com/igbinary/igbinary/";
|
||||
maintainers = teams.php.members;
|
||||
license = lib.licenses.bsd3;
|
||||
maintainers = lib.teams.php.members;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,37 +1,36 @@
|
||||
{ buildPecl
|
||||
{ stdenv
|
||||
, buildPecl
|
||||
, lib
|
||||
, libiconv
|
||||
, php
|
||||
, fetchFromGitHub
|
||||
, pcre2
|
||||
, fetchpatch
|
||||
, darwin
|
||||
}:
|
||||
|
||||
buildPecl rec {
|
||||
pname = "snuffleupagus";
|
||||
version = "0.7.0";
|
||||
version = "0.9.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "jvoisin";
|
||||
repo = pname;
|
||||
repo = "snuffleupagus";
|
||||
rev = "v${version}";
|
||||
sha256 = "1la6wa9xznc110b7isiy502x71mkvhisq6m8llhczpq4rs4nbcw2";
|
||||
hash = "sha256-1a4PYJ/j9BsoeF5V/KKGu7rqsL3YMo/FbaCBfNc4bfw=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
pcre2
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk_11_0.frameworks.CoreFoundation
|
||||
darwin.apple_sdk_11_0.Libsystem
|
||||
libiconv
|
||||
];
|
||||
|
||||
internalDeps = with php.extensions; [
|
||||
session
|
||||
];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/jvoisin/snuffleupagus/commit/3c528d9d03cec872382a6f400b5701a8fbfd59b4.patch";
|
||||
sha256 = "0lnj4xcl867f477mha697d1py1nwxhl18dvvg40qgflpdbywlzns";
|
||||
stripLen = 1;
|
||||
})
|
||||
];
|
||||
|
||||
sourceRoot = "source/src";
|
||||
|
||||
configureFlags = [
|
||||
@ -42,10 +41,10 @@ buildPecl rec {
|
||||
./configure --enable-snuffleupagus
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
meta = {
|
||||
description = "Security module for php7 and php8 - Killing bugclasses and virtual-patching the rest!";
|
||||
license = licenses.lgpl3Only;
|
||||
homepage = "https://github.com/jvoisin/snuffleupagus";
|
||||
maintainers = teams.php.members ++ [ maintainers.zupo ];
|
||||
license = lib.licenses.lgpl3Only;
|
||||
maintainers = lib.teams.php.members ++ [ lib.maintainers.zupo ];
|
||||
};
|
||||
}
|
||||
|
||||
43
pkgs/development/python-modules/array-record/default.nix
Normal file
43
pkgs/development/python-modules/array-record/default.nix
Normal file
@ -0,0 +1,43 @@
|
||||
{ lib
|
||||
, absl-py
|
||||
, buildPythonPackage
|
||||
, etils
|
||||
, fetchPypi
|
||||
, importlib-resources
|
||||
, python
|
||||
, typing-extensions
|
||||
, zipp
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "array-record";
|
||||
version = "0.4.0";
|
||||
format = "wheel";
|
||||
|
||||
disabled = python.pythonVersion != "3.10";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version format;
|
||||
pname = "array_record";
|
||||
dist = "py310";
|
||||
python = "py310";
|
||||
hash = "sha256-VHDU6RLR/z3/tNxJiDdAruz1cva6cHu5NzMlsKrLYXg=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
absl-py
|
||||
etils
|
||||
importlib-resources
|
||||
typing-extensions
|
||||
zipp
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "array_record" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "ArrayRecord is a new file format derived from Riegeli, achieving a new frontier of IO efficiency";
|
||||
homepage = "https://github.com/google/array_record";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ GaetanLepage ];
|
||||
};
|
||||
}
|
||||
@ -60,6 +60,13 @@ buildPythonPackage rec {
|
||||
"test_default_headers"
|
||||
"test_head"
|
||||
"tls"
|
||||
"test_simple_request"
|
||||
"test_node"
|
||||
"test_debug_logging"
|
||||
"test_debug_logging_uncompressed_body"
|
||||
"test_debug_logging_no_body"
|
||||
"test_httpbin"
|
||||
"test_sniffed_nodes_added_to_pool"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
65
pkgs/development/python-modules/fairscale/default.nix
Normal file
65
pkgs/development/python-modules/fairscale/default.nix
Normal file
@ -0,0 +1,65 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
# build inputs
|
||||
, torch
|
||||
, numpy
|
||||
, ninja
|
||||
# check inputs
|
||||
, pytestCheckHook
|
||||
, parameterized
|
||||
, pytest-cov
|
||||
, pytest-timeout
|
||||
, remote-pdb
|
||||
}:
|
||||
let
|
||||
pname = "fairscale";
|
||||
version = "0.4.13";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.10";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebookresearch";
|
||||
repo = "fairscale";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-L2Rl/qL6l0OLAofygzJBGQdp/2ZrgDFarwZRjyAR3dw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ ninja ];
|
||||
dontUseNinjaBuild = true;
|
||||
dontUseNinjaInstall = true;
|
||||
dontUseNinjaCheck = true;
|
||||
|
||||
propagatedBuildInputs = [
|
||||
torch
|
||||
numpy
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
parameterized
|
||||
pytest-cov
|
||||
pytest-timeout
|
||||
remote-pdb
|
||||
];
|
||||
|
||||
# Some tests try to build distributed models, which doesn't work in the sandbox.
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"fairscale"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "PyTorch extensions for high performance and large scale training";
|
||||
homepage = "https://github.com/facebookresearch/fairscale";
|
||||
changelog = "https://github.com/facebookresearch/fairscale/releases/tag/v${version}";
|
||||
license = with licenses; [ mit asl20 bsd3 ];
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
};
|
||||
}
|
||||
41
pkgs/development/python-modules/flyingsquid/default.nix
Normal file
41
pkgs/development/python-modules/flyingsquid/default.nix
Normal file
@ -0,0 +1,41 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
, pgmpy
|
||||
, torch
|
||||
}:
|
||||
let
|
||||
pname = "flyingsquid";
|
||||
version = "0.0.0a0";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "HazyResearch";
|
||||
repo = pname;
|
||||
rev = "28a713a9ac501b7597c2489468ae189943d00685";
|
||||
hash = "sha256-DPHTSxDD4EW3nrNk2fk0pKJI/8+pQ7Awywd8nxhBruo=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pgmpy
|
||||
torch
|
||||
];
|
||||
|
||||
pythonImportsCheck = [ "flyingsquid" ];
|
||||
|
||||
# no tests
|
||||
doCheck = false;
|
||||
|
||||
meta = with lib; {
|
||||
description = "More interactive weak supervision with FlyingSquid";
|
||||
homepage = "https://github.com/HazyResearch/flyingsquid";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
};
|
||||
}
|
||||
66
pkgs/development/python-modules/fvcore/default.nix
Normal file
66
pkgs/development/python-modules/fvcore/default.nix
Normal file
@ -0,0 +1,66 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
# build inputs
|
||||
, numpy
|
||||
, yacs
|
||||
, pyyaml
|
||||
, tqdm
|
||||
, termcolor
|
||||
, pillow
|
||||
, tabulate
|
||||
, iopath
|
||||
, shapely
|
||||
# check inputs
|
||||
, torch
|
||||
}:
|
||||
let
|
||||
pname = "fvcore";
|
||||
version = "0.1.5.post20221221";
|
||||
optional-dependencies = {
|
||||
all = [ shapely ];
|
||||
};
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-8vsLuQVyrmUcEceOIEk+0ZsiQFUKfku7LW3oe90DeGA=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
yacs
|
||||
pyyaml
|
||||
tqdm
|
||||
termcolor
|
||||
pillow
|
||||
tabulate
|
||||
iopath
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
torch
|
||||
];
|
||||
|
||||
# TypeError: flop_count() missing 2 required positional arguments: 'model' and 'inputs'
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"fvcore"
|
||||
];
|
||||
|
||||
passthru.optional-dependencies = optional-dependencies;
|
||||
|
||||
meta = with lib; {
|
||||
description = "Collection of common code that's shared among different research projects in FAIR computer vision team";
|
||||
homepage = "https://github.com/facebookresearch/fvcore";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
};
|
||||
}
|
||||
@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "goalzero";
|
||||
version = "0.2.1";
|
||||
version = "0.2.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-PveHE317p5fGSxgx7LQkpRYF55HwdzpZFY8/F8s3CBQ=";
|
||||
hash = "sha256-h/EaEOe0zvnO5BYfcIyC3Vq8sPED6ts1IeI/GM+vm7c=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "grpc-interceptor";
|
||||
version = "0.15.1";
|
||||
version = "0.15.2";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -19,8 +19,8 @@ buildPythonPackage rec {
|
||||
src = fetchFromGitHub {
|
||||
owner = "d5h-foss";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "md7pwlahF5kiaydLATdW7Yde8iVVcBEjCIGP5qRLwXw=";
|
||||
rev = "refs/tags/v${version}";
|
||||
sha256 = "sha256-zulK0SVehzHcrmgIyH0D5sUOiAN53eIg88IoVyF6/DA=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, imagemagick
|
||||
, matplotlib
|
||||
}:
|
||||
|
||||
@ -15,6 +16,11 @@ buildPythonPackage rec {
|
||||
|
||||
propagatedBuildInputs = [ matplotlib ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace sixel/sixel.py \
|
||||
--replace 'Popen(["convert",' 'Popen(["${imagemagick}/bin/convert",'
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "sixel" ];
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
60
pkgs/development/python-modules/metawear/default.nix
Normal file
60
pkgs/development/python-modules/metawear/default.nix
Normal file
@ -0,0 +1,60 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, gcc
|
||||
, cython
|
||||
, boost
|
||||
, bluez
|
||||
, nlohmann_json
|
||||
, pyserial
|
||||
, requests
|
||||
, warble
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "metawear";
|
||||
version = "1.0.8";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-gNEI6P6GslNd1DzFwCFndVIfUvSTPYollGdqkZhQ4Y8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cython
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
boost
|
||||
bluez
|
||||
nlohmann_json
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
# remove vendored nlohmann_json
|
||||
rm MetaWear-SDK-Cpp/src/metawear/dfu/cpp/json.hpp
|
||||
substituteInPlace MetaWear-SDK-Cpp/src/metawear/dfu/cpp/file_operations.cpp \
|
||||
--replace '#include "json.hpp"' '#include <nlohmann/json.hpp>'
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [
|
||||
pyserial
|
||||
requests
|
||||
warble
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
pythonImportsCheck = [ "mbientlab" "mbientlab.metawear" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python bindings for the MetaWear C++ SDK by MbientLab";
|
||||
homepage = "https://github.com/mbientlab/metawear-sdk-python";
|
||||
license = with licenses; [ unfree ];
|
||||
maintainers = with maintainers; [ stepbrobd ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
||||
78
pkgs/development/python-modules/pgmpy/default.nix
Normal file
78
pkgs/development/python-modules/pgmpy/default.nix
Normal file
@ -0,0 +1,78 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, pythonOlder
|
||||
# build inputs
|
||||
, networkx
|
||||
, numpy
|
||||
, scipy
|
||||
, scikit-learn
|
||||
, pandas
|
||||
, pyparsing
|
||||
, torch
|
||||
, statsmodels
|
||||
, tqdm
|
||||
, joblib
|
||||
, opt-einsum
|
||||
# check inputs
|
||||
, pytestCheckHook
|
||||
, pytest-cov
|
||||
, coverage
|
||||
, mock
|
||||
, black
|
||||
}:
|
||||
let
|
||||
pname = "pgmpy";
|
||||
version = "0.1.23";
|
||||
# optional-dependencies = {
|
||||
# all = [ daft ];
|
||||
# };
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "pgmpy";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha256-4NY37Awhu2mnfZQ/biN1wa9rkGHhTxfZm0+V7D83NR0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
networkx
|
||||
numpy
|
||||
scipy
|
||||
scikit-learn
|
||||
pandas
|
||||
pyparsing
|
||||
torch
|
||||
statsmodels
|
||||
tqdm
|
||||
joblib
|
||||
opt-einsum
|
||||
];
|
||||
|
||||
disabledTests = [
|
||||
"test_to_daft" # requires optional dependency daft
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
pytestCheckHook
|
||||
# xdoctest
|
||||
pytest-cov
|
||||
coverage
|
||||
mock
|
||||
black
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Python Library for learning (Structure and Parameter), inference (Probabilistic and Causal), and simulations in Bayesian Networks";
|
||||
homepage = "https://github.com/pgmpy/pgmpy";
|
||||
changelog = "https://github.com/pgmpy/pgmpy/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
};
|
||||
}
|
||||
62
pkgs/development/python-modules/posthog/default.nix
Normal file
62
pkgs/development/python-modules/posthog/default.nix
Normal file
@ -0,0 +1,62 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
# build inputs
|
||||
, requests
|
||||
, six
|
||||
, monotonic
|
||||
, backoff
|
||||
, python-dateutil
|
||||
# check inputs
|
||||
, mock
|
||||
, freezegun
|
||||
, pylint
|
||||
, flake8
|
||||
, coverage
|
||||
, pytest
|
||||
}:
|
||||
let
|
||||
pname = "posthog";
|
||||
version = "3.0.1";
|
||||
in
|
||||
buildPythonPackage {
|
||||
inherit pname version;
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "PostHog";
|
||||
repo = "posthog-python";
|
||||
rev = "refs/tags/v${version}";
|
||||
hash = "sha256-GSHsa05DUcbIHg1HCoIn8d4NZoG+Iddqfgod2nP4fX0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
requests
|
||||
six
|
||||
monotonic
|
||||
backoff
|
||||
python-dateutil
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
mock
|
||||
freezegun
|
||||
pylint
|
||||
flake8
|
||||
coverage
|
||||
pytest
|
||||
];
|
||||
|
||||
pythonImportsCheck = [
|
||||
"posthog"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Official PostHog python library";
|
||||
homepage = "https://github.com/PostHog/posthog-python";
|
||||
changelog = "https://github.com/PostHog/posthog-python/releases/tag/v${version}";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ happysalada ];
|
||||
};
|
||||
}
|
||||
@ -11,7 +11,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyezviz";
|
||||
version = "0.2.2.1";
|
||||
version = "0.2.2.2";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.6";
|
||||
@ -20,7 +20,7 @@ buildPythonPackage rec {
|
||||
owner = "baqs";
|
||||
repo = "pyEzviz";
|
||||
rev = "refs/tags/${version}";
|
||||
hash = "sha256-ZBE9Vb6GsIbkznJszJNtmwb6e3vUl5+r99yFoF8LNZE=";
|
||||
hash = "sha256-YQlPv8YfPbYfpg+4VrLWHOWYJoecuAr3K7JBiogiI/g=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "restrictedpython";
|
||||
version = "6.0";
|
||||
version = "6.1";
|
||||
format = "setuptools";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
@ -17,7 +17,7 @@ buildPythonPackage rec {
|
||||
src = fetchPypi {
|
||||
pname = "RestrictedPython";
|
||||
inherit version;
|
||||
hash = "sha256-QFzwvZ7sLxmxMmtfSCKO/lbWWQtOkYJrjMOyzUAKlq0=";
|
||||
hash = "sha256-fljqFcySoLkW4MjKKV6LLG1A/uTRLhorUGPYbvwnmpw=";
|
||||
};
|
||||
|
||||
nativeCheckInputs = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "flow";
|
||||
version = "0.209.1";
|
||||
version = "0.211.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "facebook";
|
||||
repo = "flow";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-s40gEZjtbqFfQGOVhLYG1Wd/CCyfFB1qoQpk2Huz5P0=";
|
||||
sha256 = "sha256-edfNDy6LvlHlNloDTSmHCaHZFdBpBkUQG757gweqquk=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
@ -7,16 +7,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "fq";
|
||||
version = "0.6.0";
|
||||
version = "0.7.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "wader";
|
||||
repo = "fq";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-j7s9oluNtYi6MmTKCendTIjc/zvynY6fWvXH47XkwOI=";
|
||||
hash = "sha256-lXU2BX0197aqdXAApDM7Gp24XAsTfpv0NrrWUguVVx0=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-XobOcG5s2ggTk3RmJPM14OWv45PMyKs0w0BOvozUobw=";
|
||||
vendorHash = "sha256-sswb9K4y+G+C4esFM9/OVG/VGl34Fx3ma6/zI6V1DWU=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@ -53,13 +53,13 @@ let
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "godot";
|
||||
version = "4.0.3-stable";
|
||||
version = "4.1-stable";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "godotengine";
|
||||
repo = "godot";
|
||||
rev = version;
|
||||
hash = "sha256-g9+CV3HsiJqiSJpZvK0N7BqKzp2Pvi6otjRLsFdmWGk=";
|
||||
hash = "sha256-v9qKrPYQz4c+xkSu/2ru7ZE5EzKVyXhmrxyHZQkng2U=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "ols";
|
||||
version = "nightly-2023-05-18";
|
||||
version = "nightly-2023-07-09";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "DanielGavin";
|
||||
repo = "ols";
|
||||
rev = "fd136199897d5e5c87f6f1fbfd076ed18e41d7b7";
|
||||
hash = "sha256-lRoDSc2bZSuXTam3Q5OOlSD6YAobCFKNRbtQ41Qx5EY=";
|
||||
rev = "255ad5958026dc3a3116f621eaebd501b8b26a22";
|
||||
hash = "sha256-XtlIZToNvmU4GhUJAxuVmKvKwnPebaxjv7jp/AgE/uM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@ -13,14 +13,14 @@
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "rust-analyzer-unwrapped";
|
||||
version = "2023-07-03";
|
||||
cargoSha256 = "sha256-KwtW2waJgwniiUYjG9SQvFwQWRHnzByi1rRhyX1sTZ0=";
|
||||
version = "2023-07-10";
|
||||
cargoSha256 = "sha256-vC1LwbSnz8TNkmt23XIEZEzOViLJgn+J5e98MYWG+BU=";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rust-lang";
|
||||
repo = "rust-analyzer";
|
||||
rev = version;
|
||||
sha256 = "sha256-X+KyFB3f32SLEEDWWvMJ9xHsdyeGCkFRJZK4zlLHyVA=";
|
||||
sha256 = "sha256-LPU6TxxzZd3FlAL+W6oo4g0WA/+6G2JccC93W4ED8yA=";
|
||||
};
|
||||
|
||||
cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ];
|
||||
|
||||
@ -1,24 +1,20 @@
|
||||
{ buildGoModule, fetchFromGitHub, lib, patchResolver ? true }:
|
||||
{ buildGoModule, fetchFromGitHub, lib }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "summon";
|
||||
version = "0.8.2";
|
||||
version = "0.9.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "cyberark";
|
||||
repo = "summon";
|
||||
rev = "v${version}";
|
||||
sha256 = "1z4xnrncwvp3rfm97zvc0ivvw2fh1hrjhj3rplvidzxjfyasbvwv";
|
||||
hash = "sha256-OOIq6U7HCxcYvBFZdewSpglg9lFzITsb6IPu/EID+Z0=";
|
||||
};
|
||||
|
||||
vendorSha256 = "1597vrs4b7k6gkmkvf7xnd38rvjixmlcz0j7npmik9nbkm57l74m";
|
||||
vendorHash = "sha256-qh3DJFxf1FqYgbULo4M+0nSOQ6uTlMTjAqNl7l+IPvk=";
|
||||
|
||||
subPackages = [ "cmd" ];
|
||||
|
||||
# Patches provider resolver to support resolving unqualified names
|
||||
# from $PATH, e.g. `summon -p gopass` instead of `summon -p $(which gopass)`
|
||||
patches = lib.optionals patchResolver [ ./resolve-paths.patch ];
|
||||
|
||||
postInstall = ''
|
||||
mv $out/bin/cmd $out/bin/summon
|
||||
'';
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
From dd34727ebfbd59738084eeb7c2a020e40a4d0abe Mon Sep 17 00:00:00 2001
|
||||
From: Quentin <Quentin Inkling>
|
||||
Date: Mon, 29 Jun 2020 17:35:04 +0300
|
||||
Subject: [PATCH] Patch for
|
||||
|
||||
---
|
||||
provider/provider.go | 15 +++++++++++++++
|
||||
1 file changed, 15 insertions(+)
|
||||
|
||||
diff --git a/provider/provider.go b/provider/provider.go
|
||||
index c1e28d9..f20fdaa 100644
|
||||
--- a/provider/provider.go
|
||||
+++ b/provider/provider.go
|
||||
@@ -78,7 +78,22 @@ func expandPath(provider string) string {
|
||||
if path.Base(provider) != provider {
|
||||
return provider
|
||||
}
|
||||
+
|
||||
+ var (
|
||||
+ stdOut bytes.Buffer
|
||||
+ stdErr bytes.Buffer
|
||||
+ )
|
||||
+ cmd := exec.Command("which", provider)
|
||||
+ cmd.Stdout = &stdOut
|
||||
+ cmd.Stderr = &stdErr
|
||||
+ err := cmd.Run()
|
||||
+
|
||||
+ if err == nil {
|
||||
+ return strings.TrimSpace(stdOut.String())
|
||||
+ }
|
||||
+
|
||||
return path.Join(DefaultPath, provider)
|
||||
+
|
||||
}
|
||||
|
||||
func getDefaultPath() string {
|
||||
--
|
||||
2.27.0
|
||||
|
||||
@ -8,8 +8,12 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs:
|
||||
let
|
||||
dxvk32 = if stdenv.isDarwin then pkgsCross.mingw32.dxvk_1 else pkgsCross.mingw32.dxvk_2;
|
||||
dxvk64 = if stdenv.isDarwin then pkgsCross.mingwW64.dxvk_1 else pkgsCross.mingwW64.dxvk_2;
|
||||
dxvk32 = if stdenv.isDarwin
|
||||
then pkgsCross.mingw32.dxvk_1.override { enableMoltenVKCompat = true; }
|
||||
else pkgsCross.mingw32.dxvk_2;
|
||||
dxvk64 = if stdenv.isDarwin
|
||||
then pkgsCross.mingwW64.dxvk_1.override { enableMoltenVKCompat = true; }
|
||||
else pkgsCross.mingwW64.dxvk_2;
|
||||
in
|
||||
{
|
||||
pname = "dxvk";
|
||||
|
||||
@ -5,14 +5,16 @@
|
||||
, meson
|
||||
, ninja
|
||||
, windows
|
||||
, dxvkVersion
|
||||
, dxvkVersion ? "default"
|
||||
, spirv-headers
|
||||
, vulkan-headers
|
||||
, SDL2
|
||||
, glfw
|
||||
, pkgsBuildHost
|
||||
, gitUpdater
|
||||
, sdl2Support ? true
|
||||
, glfwSupport ? false
|
||||
, enableMoltenVKCompat ? false
|
||||
}:
|
||||
|
||||
# SDL2 and GLFW support are mutually exclusive.
|
||||
@ -34,7 +36,7 @@ let
|
||||
hash = "sha256-T93ZylxzJGprrP+j6axZwl2d3hJowMCUOKNjIyNzkmE=";
|
||||
};
|
||||
# These patches are required when using DXVK with Wine on Darwin.
|
||||
patches = lib.optionals stdenv.buildPlatform.isDarwin [
|
||||
patches = lib.optionals enableMoltenVKCompat [
|
||||
# Patch DXVK to work with MoltenVK even though it doesn’t support some required features.
|
||||
# Some games work poorly (particularly Unreal Engine 4 games), but others work pretty well.
|
||||
./darwin-dxvk-compat.patch
|
||||
@ -43,13 +45,13 @@ let
|
||||
./darwin-thread-primitives.patch
|
||||
];
|
||||
};
|
||||
"2.1" = rec {
|
||||
version = "2.1";
|
||||
"default" = rec {
|
||||
version = "2.2";
|
||||
src = fetchFromGitHub {
|
||||
owner = "doitsujin";
|
||||
repo = "dxvk";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-A4KR11brfQbR56dGt371MRwMN/H6HFAU8TlFC97/bRs=";
|
||||
hash = "sha256-GKRd66DvcA+7p3/wDqAUi02ZLRSVZ/fvJM0PQDEKVMA=";
|
||||
fetchSubmodules = true; # Needed for the DirectX headers and libdisplay-info
|
||||
};
|
||||
patches = [ ];
|
||||
@ -59,7 +61,7 @@ let
|
||||
isWindows = stdenv.targetPlatform.uname.system == "Windows";
|
||||
isCross = stdenv.hostPlatform != stdenv.targetPlatform;
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "dxvk";
|
||||
inherit (srcs.${dxvkVersion}) version src patches;
|
||||
|
||||
@ -95,6 +97,12 @@ stdenv.mkDerivation {
|
||||
|
||||
doCheck = isDxvk2 && !isCross;
|
||||
|
||||
passthru = lib.optionalAttrs (lib.versionAtLeast finalAttrs.version "2.0") {
|
||||
updateScript = gitUpdater {
|
||||
rev-prefix = "v";
|
||||
};
|
||||
};
|
||||
|
||||
meta = {
|
||||
description = "A Vulkan-based translation layer for Direct3D 9/10/11";
|
||||
homepage = "https://github.com/doitsujin/dxvk";
|
||||
@ -103,4 +111,4 @@ stdenv.mkDerivation {
|
||||
license = lib.licenses.zlib;
|
||||
platforms = lib.platforms.windows ++ lib.optionals isDxvk2 lib.platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
||||
@ -6,12 +6,12 @@
|
||||
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "airbuddy";
|
||||
version = "2.6.3";
|
||||
version = "2.7";
|
||||
|
||||
src = fetchurl {
|
||||
name = "AirBuddy.dmg";
|
||||
url = "https://download.airbuddy.app/WebDownload/AirBuddy_v${finalAttrs.version}.dmg";
|
||||
hash = "sha256-q/Mbkm90ptIkdTLV2KDT9CM2Hsxnkway5Fw0F6d7Tqc=";
|
||||
hash = "sha256-i/pxRG5o03jh9D46F9s8cSpf8A1aQEb+u3JiPjDlubA=";
|
||||
};
|
||||
|
||||
dontPatch = true;
|
||||
@ -21,6 +21,18 @@ stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
|
||||
nativeBuildInputs = [ undmg ];
|
||||
|
||||
# AirBuddy.dmg is not HFS formatted, default unpackPhase fails
|
||||
# https://discourse.nixos.org/t/help-with-error-only-hfs-file-systems-are-supported-on-ventura
|
||||
unpackCmd = ''
|
||||
mnt=$(mktemp -d)
|
||||
|
||||
/usr/bin/hdiutil attach -nobrowse -readonly $src -mountpoint $mnt
|
||||
|
||||
shopt -s extglob
|
||||
DEST="$PWD"
|
||||
(cd "$mnt"; cp -a !(Applications) "$DEST/")
|
||||
'';
|
||||
|
||||
sourceRoot = "AirBuddy.app";
|
||||
|
||||
installPhase = ''
|
||||
|
||||
@ -123,7 +123,7 @@ let
|
||||
in
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "fwupd";
|
||||
version = "1.9.2";
|
||||
version = "1.9.3";
|
||||
|
||||
# libfwupd goes to lib
|
||||
# daemon, plug-ins and libfwupdplugin go to out
|
||||
@ -134,7 +134,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
owner = "fwupd";
|
||||
repo = "fwupd";
|
||||
rev = finalAttrs.version;
|
||||
hash = "sha256-ESBTT7KO4WZKS5ArXZI0pxQpfFK4h4HbClaITm5bxfU=";
|
||||
hash = "sha256-IVP5RVHRxWkvPqndiuCxiguYWN5d32qJo9YzBOHoyUk";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 7ac8c937a..5a23d0c80 100644
|
||||
index b18108c74..7e674b4d2 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -419,7 +419,7 @@ if build_standalone and efiboot.found() and efivar.found()
|
||||
conf.set('HAVE_EFI_TIME_T', '1')
|
||||
endif
|
||||
|
||||
@@ -404,7 +404,7 @@ endif
|
||||
|
||||
# EFI
|
||||
if build_standalone
|
||||
- efi_app_location = join_paths(libexecdir, 'fwupd', 'efi')
|
||||
+ efi_app_location = join_paths(dependency('fwupd-efi').get_variable(pkgconfig: 'prefix'), 'libexec', 'fwupd', 'efi')
|
||||
conf.set_quoted('EFI_APP_LOCATION', efi_app_location)
|
||||
|
||||
if host_cpu == 'x86'
|
||||
EFI_MACHINE_TYPE_NAME = 'ia32'
|
||||
|
||||
@ -1,19 +1,19 @@
|
||||
{ lib, fetchFromGitHub, buildLinux, ... } @ args:
|
||||
{ lib, stdenv, fetchFromGitHub, buildLinux, ... } @ args:
|
||||
|
||||
let
|
||||
# comments with variant added for update script
|
||||
# ./update-zen.py zen
|
||||
zenVariant = {
|
||||
version = "6.4.1"; #zen
|
||||
version = "6.4.2"; #zen
|
||||
suffix = "zen1"; #zen
|
||||
sha256 = "05a3dplzz6vy5gjz9yd1hz7n4xf3mlr2q112kf3yabg8k8izqnys"; #zen
|
||||
sha256 = "1swd3y97w55wh9vl6k1bsrx6fqi6b6ssbw306h87nxn36xwzx8cd"; #zen
|
||||
isLqx = false;
|
||||
};
|
||||
# ./update-zen.py lqx
|
||||
lqxVariant = {
|
||||
version = "6.3.11"; #lqx
|
||||
suffix = "lqx2"; #lqx
|
||||
sha256 = "0hpzafw2zwy25ss4cwj6mm8pr1nnv680m8bfcal29f7gaxbm96k8"; #lqx
|
||||
version = "6.4.2"; #lqx
|
||||
suffix = "lqx1"; #lqx
|
||||
sha256 = "14hr88lbwm2pz3knw6nxlahdk4pwwb4ya63mrd7zg7g1x2xhfb59"; #lqx
|
||||
isLqx = true;
|
||||
};
|
||||
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {
|
||||
@ -28,13 +28,84 @@ let
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
# This is based on the following sources:
|
||||
# - zen: https://gitlab.archlinux.org/archlinux/packaging/packages/linux-zen/-/blob/main/config
|
||||
# - lqx: https://github.com/damentz/liquorix-package/blob/6.4/master/linux-liquorix/debian/config/kernelarch-x86/config-arch-64
|
||||
# - Liquorix features: https://liquorix.net/
|
||||
# The list below is not exhaustive, so the kernels probably doesn't match
|
||||
# the upstream, but should bring most of the improvements that will be
|
||||
# expected by users
|
||||
structuredExtraConfig = with lib.kernel; {
|
||||
# Zen Interactive tuning
|
||||
ZEN_INTERACTIVE = yes;
|
||||
|
||||
# FQ-Codel Packet Scheduling
|
||||
NET_SCH_DEFAULT = yes;
|
||||
DEFAULT_FQ_CODEL = yes;
|
||||
DEFAULT_NET_SCH = freeform "fq_codel";
|
||||
|
||||
# Preempt (low-latency)
|
||||
PREEMPT = lib.mkOverride 60 yes;
|
||||
PREEMPT_VOLUNTARY = lib.mkOverride 60 no;
|
||||
|
||||
# Preemptible tree-based hierarchical RCU
|
||||
TREE_RCU = yes;
|
||||
PREEMPT_RCU = yes;
|
||||
RCU_EXPERT = yes;
|
||||
TREE_SRCU = yes;
|
||||
TASKS_RCU_GENERIC = yes;
|
||||
TASKS_RCU = yes;
|
||||
TASKS_RUDE_RCU = yes;
|
||||
TASKS_TRACE_RCU = yes;
|
||||
RCU_STALL_COMMON = yes;
|
||||
RCU_NEED_SEGCBLIST = yes;
|
||||
RCU_FANOUT = freeform "64";
|
||||
RCU_FANOUT_LEAF = freeform "16";
|
||||
RCU_BOOST = yes;
|
||||
RCU_BOOST_DELAY = freeform "500";
|
||||
RCU_NOCB_CPU = yes;
|
||||
RCU_LAZY = yes;
|
||||
|
||||
# Futex WAIT_MULTIPLE implementation for Wine / Proton Fsync.
|
||||
FUTEX = yes;
|
||||
FUTEX_PI = yes;
|
||||
|
||||
# Preemptive Full Tickless Kernel at 1000Hz
|
||||
HZ = freeform "1000";
|
||||
HZ_1000 = yes;
|
||||
} // lib.optionalAttrs (isLqx) {
|
||||
# Google's BBRv2 TCP congestion Control
|
||||
TCP_CONG_BBR2 = yes;
|
||||
DEFAULT_BBR2 = yes;
|
||||
DEFAULT_TCP_CONG = freeform "bbr2";
|
||||
|
||||
# PDS Process Scheduler
|
||||
SCHED_ALT = yes;
|
||||
SCHED_PDS = yes;
|
||||
|
||||
# Swap storage is compressed with LZ4 using zswap
|
||||
ZSWAP_COMPRESSOR_DEFAULT_LZ4 = yes;
|
||||
ZSWAP_COMPRESSOR_DEFAULT = freeform "lz4";
|
||||
|
||||
# Fix error: unused option: XXX.
|
||||
CFS_BANDWIDTH = lib.mkForce (option no);
|
||||
PSI = lib.mkForce (option no);
|
||||
RT_GROUP_SCHED = lib.mkForce (option no);
|
||||
SCHED_AUTOGROUP = lib.mkForce (option no);
|
||||
SCHED_CORE = lib.mkForce (option no);
|
||||
|
||||
# ERROR: modpost: "sched_numa_hop_mask" [drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.ko] undefined!
|
||||
MLX5_CORE = no;
|
||||
};
|
||||
|
||||
passthru.updateScript = [ ./update-zen.py (if isLqx then "lqx" else "zen") ];
|
||||
|
||||
extraMeta = {
|
||||
branch = lib.versions.majorMinor version + "/master";
|
||||
maintainers = with lib.maintainers; [ ];
|
||||
maintainers = with lib.maintainers; [ thiagokokada ];
|
||||
description = "Built using the best configuration and kernel sources for desktop, multimedia, and gaming workloads." +
|
||||
lib.optionalString isLqx " (Same as linux_zen but less aggressive release schedule)";
|
||||
lib.optionalString isLqx " (Same as linux_zen, but less aggressive release schedule and additional extra config)";
|
||||
broken = stdenv.isAarch64;
|
||||
};
|
||||
|
||||
} // (args.argsOverride or { }));
|
||||
|
||||
@ -7,6 +7,7 @@ rec {
|
||||
version = "unstable-2023-05-02";
|
||||
rev = "3189b5f325b7ef8b88e3edec7c1cde4fce73c76c";
|
||||
outputHashAlgo = "sha256";
|
||||
outputHash = "sha256-FpMp7z+B3cR3LkQ+PooH/b1/NlxH8NHVJNWifaPWt4U=";
|
||||
|
||||
# This 256 byte seed is the only pre-compiled binary in the bootstrap chain.
|
||||
hex0-seed = import <nix/fetchurl.nix> {
|
||||
@ -29,7 +30,7 @@ rec {
|
||||
|
||||
Run the following command:
|
||||
```
|
||||
nix hash file $(nix build --print-out-paths -f '<nixpkgs>' make-minimal-bootstrap-sources)
|
||||
nix hash path $(nix build --print-out-paths -f '<nixpkgs>' make-minimal-bootstrap-sources)
|
||||
```
|
||||
|
||||
# Why do we need this `.nar` archive?
|
||||
@ -71,11 +72,10 @@ rec {
|
||||
requirements above apply to `minimal-bootstrap-sources`.
|
||||
*/
|
||||
minimal-bootstrap-sources = derivation {
|
||||
name = "${name}.nar.xz";
|
||||
inherit name;
|
||||
system = builtins.currentSystem;
|
||||
outputHashMode = "flat";
|
||||
inherit outputHashAlgo;
|
||||
outputHash = "sha256-ig988BiRTz92hhZZgKQW1tVPoV4aQ2D69Cq3wHvVgHg=";
|
||||
outputHashMode = "recursive";
|
||||
inherit outputHashAlgo outputHash;
|
||||
|
||||
# This builder always fails, but fortunately Nix will print the
|
||||
# "builder", which is really the error message that we want the
|
||||
@ -85,22 +85,21 @@ rec {
|
||||
#
|
||||
# Neither your store nor your substituters seems to have:
|
||||
#
|
||||
# ${name}.nar.xz
|
||||
# ${builtins.placeholder "out"}
|
||||
#
|
||||
# Please obtain or create this file, give it exactly the name
|
||||
# shown above, and then run the following command:
|
||||
#
|
||||
# nix-store --add-fixed ${outputHashAlgo} ${name}.nar.xz
|
||||
#
|
||||
# You can create this file from an already-bootstrapped nixpkgs
|
||||
# You can create this path from an already-bootstrapped nixpkgs
|
||||
# using the following command:
|
||||
#
|
||||
# nix-build '<nixpkgs>' -A make-minimal-bootstrap-sources
|
||||
#
|
||||
# Or, if you prefer, you can create this file using only `git`,
|
||||
# `nix`, and `xz`. For the commands needed in order to do this,
|
||||
# see `make-bootstrap-sources.nix`.
|
||||
# see `make-bootstrap-sources.nix`. Once you have the manual
|
||||
# result, do:
|
||||
#
|
||||
# nix-store --add-fixed --recursive ${outputHashAlgo} ./${name}
|
||||
#
|
||||
# to add it to your store.
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
||||
@ -8,44 +8,36 @@
|
||||
#
|
||||
# To build:
|
||||
#
|
||||
# nix-build '<nixpkgs>' -o sources.nar.xz -A make-minimal-bootstrap-sources
|
||||
# nix-build '<nixpkgs>' -A make-minimal-bootstrap-sources
|
||||
#
|
||||
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, runCommand
|
||||
, nix
|
||||
, xz
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (import ./bootstrap-sources.nix { }) name rev;
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "oriansj";
|
||||
repo = "stage0-posix";
|
||||
inherit rev;
|
||||
sha256 = "sha256-FpMp7z+B3cR3LkQ+PooH/b1/NlxH8NHVJNWifaPWt4U=";
|
||||
fetchSubmodules = true;
|
||||
postFetch = ''
|
||||
# Seed binaries will be fetched separately
|
||||
echo "Removing seed binaries"
|
||||
rm -rf $out/bootstrap-seeds/*
|
||||
|
||||
# Remove vendored/duplicate M2libc's
|
||||
echo "Removing duplicate M2libc"
|
||||
rm -rf \
|
||||
$out/M2-Mesoplanet/M2libc \
|
||||
$out/M2-Planet/M2libc \
|
||||
$out/mescc-tools/M2libc \
|
||||
$out/mescc-tools-extra/M2libc
|
||||
'';
|
||||
};
|
||||
|
||||
expected = import ./bootstrap-sources.nix { };
|
||||
in
|
||||
runCommand "${name}.nar.xz" {
|
||||
nativeBuildInputs = [ nix xz ];
|
||||
|
||||
passthru = { inherit src; };
|
||||
fetchFromGitHub {
|
||||
inherit (expected) name rev;
|
||||
owner = "oriansj";
|
||||
repo = "stage0-posix";
|
||||
sha256 = expected.outputHash;
|
||||
fetchSubmodules = true;
|
||||
postFetch = ''
|
||||
# Seed binaries will be fetched separately
|
||||
echo "Removing seed binaries"
|
||||
rm -rf $out/bootstrap-seeds/*
|
||||
|
||||
# Remove vendored/duplicate M2libc's
|
||||
echo "Removing duplicate M2libc"
|
||||
rm -rf \
|
||||
$out/M2-Mesoplanet/M2libc \
|
||||
$out/M2-Planet/M2libc \
|
||||
$out/mescc-tools/M2libc \
|
||||
$out/mescc-tools-extra/M2libc
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Packaged sources for the first bootstrapping stage";
|
||||
@ -54,6 +46,4 @@ runCommand "${name}.nar.xz" {
|
||||
maintainers = teams.minimal-bootstrap.members;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
} ''
|
||||
nix-store --dump ${src} | xz -c > $out
|
||||
''
|
||||
}
|
||||
|
||||
@ -9,13 +9,13 @@
|
||||
|
||||
buildDotnetModule rec {
|
||||
pname = "jackett";
|
||||
version = "0.21.449";
|
||||
version = "0.21.455";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
hash = "sha512-QbxFpXWrqJjajvWvuWDD8K9Y88rIvaj+cnbu4K84g0MXuhfD0fyxJoRb5d4SewJWbWEQ6dXzEiQ6fPdqY+MYew==";
|
||||
hash = "sha512-yeTl0s6mT9Z8bT7HND9XcjRZCvbzg2wUzbZo/gXIGk5MSZ6ktgVSBG8YuSCdIIrfRS0P4VEkyipkSn/QXMBe4Q==";
|
||||
};
|
||||
|
||||
projectFile = "src/Jackett.Server/Jackett.Server.csproj";
|
||||
|
||||
@ -1,19 +1,41 @@
|
||||
{ lib
|
||||
, rustPlatform
|
||||
, fetchCrate
|
||||
, fetchFromGitHub
|
||||
, pkg-config
|
||||
, oniguruma
|
||||
, openssl
|
||||
, stdenv
|
||||
, darwin
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "microbin";
|
||||
version = "1.2.1";
|
||||
version = "2.0.4";
|
||||
|
||||
# The GitHub source is outdated
|
||||
src = fetchCrate {
|
||||
inherit pname version;
|
||||
hash = "sha256-OLg0ejs9nanMNlY0lcnJ/RoRwefrXEaaROwx5aPx4u8=";
|
||||
src = fetchFromGitHub {
|
||||
owner = "szabodanika";
|
||||
repo = "microbin";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-fsRpqSYDsuV0M6Xar2GVoyTgCPT39dcKJ6eW4YXCkQ0=";
|
||||
};
|
||||
|
||||
cargoHash = "sha256-XdHP0XruqtyLyGbLHielnmTAc3ZgeIyyZnknO+5k4Xo=";
|
||||
cargoHash = "sha256-7GSgyh2aJ2f8pozoh/0Yxzbk8Wg3JYuqSy/34ywAc2s=";
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
oniguruma
|
||||
openssl
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
darwin.apple_sdk.frameworks.Security
|
||||
];
|
||||
|
||||
env = {
|
||||
OPENSSL_NO_VENDOR = true;
|
||||
RUSTONIG_SYSTEM_LIBONIG = true;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "A tiny, self-contained, configurable paste bin and URL shortener written in Rust";
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "telegraf";
|
||||
version = "1.27.1";
|
||||
version = "1.27.2";
|
||||
|
||||
excludedPackages = "test";
|
||||
|
||||
@ -18,10 +18,10 @@ buildGoModule rec {
|
||||
owner = "influxdata";
|
||||
repo = "telegraf";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-P0E5/sFvrO58SG94cGatRFPWMwrBBrvxdckc0mUaFPE=";
|
||||
sha256 = "sha256-SkStt8PRWWkM01NrO4UTRVq84s3qlRrddl2vTxWsLME=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-n6tPCVormgNEDcUmDXmpiFjJQXgAccGtCFT1GHwOdV4=";
|
||||
vendorHash = "sha256-gOsVBvjPb2MLe2xOfuDldUy9ZpaBaCPxgxbZae1gyUQ=";
|
||||
proxyVendor = true;
|
||||
|
||||
ldflags = [
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "carapace";
|
||||
version = "0.25.0";
|
||||
version = "0.25.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "rsteube";
|
||||
repo = "${pname}-bin";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-bDyq//2sk97Dq8jAToOsQowGUUJTfc2s/bCK47O9ns0=";
|
||||
sha256 = "sha256-EWdo+86mZt5sQMPgX2Co484YaP6An7o7t9rmn3GujaI=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-hDMq6XksYvMGDR7MAjoSNhKBC5/WgPQWuc/PYotvdTA=";
|
||||
vendorHash = "sha256-R+PfIG3d0eB0eTpAnZfSnvACtDOv0uxIzoW+f7rF4cY=";
|
||||
|
||||
ldflags = [
|
||||
"-s"
|
||||
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "audiowaveform";
|
||||
version = "1.8.0";
|
||||
version = "1.8.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "bbc";
|
||||
repo = "audiowaveform";
|
||||
rev = version;
|
||||
sha256 = "sha256-3Fpc0HvtuAYIkyuFrZ+sHkHRHaP4vo0Q4IoGqTksyqE=";
|
||||
sha256 = "sha256-MbOQY1Yvtwuy6IPV1BfwwRBhEQIzQ7mPzedE74xsQSk=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake gtest ];
|
||||
|
||||
61
pkgs/tools/audio/mpd-notification/default.nix
Normal file
61
pkgs/tools/audio/mpd-notification/default.nix
Normal file
@ -0,0 +1,61 @@
|
||||
{ lib
|
||||
, stdenv
|
||||
, pkg-config
|
||||
, fetchFromGitHub
|
||||
, systemd
|
||||
, file
|
||||
, iniparser
|
||||
, ffmpeg
|
||||
, libnotify
|
||||
, libmpdclient
|
||||
, discount
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "mpd-notification";
|
||||
version = "0.8.7";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "eworm-de";
|
||||
repo = "mpd-notification";
|
||||
rev = version;
|
||||
hash = "sha256-lBvx2eYxFJUAxR1LrjWHZUeAo+WnQKmPYJVAJTeXqHY=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
iniparser
|
||||
libnotify
|
||||
file
|
||||
ffmpeg
|
||||
libmpdclient
|
||||
discount
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
mv mpd-notification $out/bin
|
||||
|
||||
mkdir -p $out/lib/systemd/user
|
||||
cp systemd/mpd-notification.service $out/lib/systemd/user
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace systemd/mpd-notification.service --replace /usr $out
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Notifications for mpd";
|
||||
homepage = "https://github.com/eworm-de/mpd-notification";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ CaitlinDavitt ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
@ -2,13 +2,13 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "bluetuith";
|
||||
version = "0.1.5";
|
||||
version = "0.1.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "darkhz";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-ii81XrIOhJNQtQWeLSqWCE4xhJOcXTzgnXm2Z20HvHo=";
|
||||
sha256 = "sha256-9fhgld0jhljvDMsRlU+jXsJla2oNjdsFm8TbmmvcoL4=";
|
||||
};
|
||||
|
||||
vendorHash = "sha256-eSgjIZmD5HL8S1XY0LK2IeWDchjFWBlRq5qriBg7l2U=";
|
||||
|
||||
35
pkgs/tools/filesystems/mountain-duck/default.nix
Normal file
35
pkgs/tools/filesystems/mountain-duck/default.nix
Normal file
@ -0,0 +1,35 @@
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, fetchurl
|
||||
, unzip
|
||||
}:
|
||||
stdenvNoCC.mkDerivation (finalAttrs: {
|
||||
pname = "mountain-duck";
|
||||
version = "4.14.1.21330";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://dist.mountainduck.io/Mountain%20Duck-${finalAttrs.version}.zip";
|
||||
sha256 = "0wcnqwzrhzgjpm7pqzbn4fbnwc5rnmw56gma0a1961d5j9vqcs49";
|
||||
};
|
||||
dontUnpack = true;
|
||||
|
||||
nativeBuildInputs = [ unzip ];
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/Applications
|
||||
unzip -d $out/Applications $src
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Mount server and cloud storage as a disk on macOS and Windows";
|
||||
homepage = "https://mountainduck.io";
|
||||
license = licenses.unfree;
|
||||
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
|
||||
maintainers = with maintainers; [ emilytrau Enzime ];
|
||||
platforms = platforms.darwin;
|
||||
};
|
||||
})
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "ua";
|
||||
version = "unstable-2021-12-18";
|
||||
version = "unstable-2022-10-23";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "sloonz";
|
||||
repo = "ua";
|
||||
rev = "b6d75970bb4f6f340887e1eadad5aa8ce78f30e3";
|
||||
sha256 = "sha256-rCp8jyqQfq5eVdvKZz3vKuDfcR+gQOEAfBZx2It/rb0=";
|
||||
rev = "f636f5eec425754d8a8be8e767c5b3e4f31fe1f9";
|
||||
hash = "sha256-U9fApk/dyz7xSho2W8UT0OGIeOYR/v9lM0LHN2OqTEQ=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-0O80uhxSVsV9N7Z/FgaLwcjZqeb4MqSCE1YW5Zd32ns=";
|
||||
vendorHash = "sha256-0O80uhxSVsV9N7Z/FgaLwcjZqeb4MqSCE1YW5Zd32ns=";
|
||||
|
||||
nativeBuildInputs = [ pkg-config ];
|
||||
buildInputs = [ glib libxml2 ];
|
||||
|
||||
@ -2,16 +2,16 @@
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "webwormhole";
|
||||
version = "unstable-2021-01-16";
|
||||
version = "unstable-2023-02-25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "saljam";
|
||||
repo = pname;
|
||||
rev = "c85e196c8a8a885815136aa8aee1958ad80a3bb5";
|
||||
sha256 = "D10xmBwmEbeR3nU4CmppFBzdeE4Pm2+o/Vb5Yd+pPtM=";
|
||||
rev = "25b68f4f4c1aaa0c6c1949b60bd4ef52ec972ebb";
|
||||
hash = "sha256-JFmfwHBa/lNGTOIIgnMFc4VMlsXtjX9v9Tn2XpdVMfA=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-yK04gjDO6JSDcJULcbJBBuPBhx792JNn+B227lDUrWk=";
|
||||
vendorHash = "sha256-+7ctAm2wnjmfMd6CHXlcAUwiUMS7cH4koDAvlEUAXEg=";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Send files using peer authenticated WebRTC";
|
||||
|
||||
@ -1,9 +1,7 @@
|
||||
{ lib
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, symlinkJoin
|
||||
, buildGoModule
|
||||
, runCommand
|
||||
, makeWrapper
|
||||
, nix-update-script
|
||||
, v2ray-geoip
|
||||
@ -11,25 +9,18 @@
|
||||
, assets ? [ v2ray-geoip v2ray-domain-list-community ]
|
||||
}:
|
||||
|
||||
let
|
||||
assetsDrv = symlinkJoin {
|
||||
name = "v2ray-assets";
|
||||
paths = assets;
|
||||
};
|
||||
|
||||
in
|
||||
buildGoModule rec {
|
||||
pname = "xray";
|
||||
version = "1.8.1";
|
||||
version = "1.8.3";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "XTLS";
|
||||
repo = "Xray-core";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-yvfBrMQPvIzuLT9wAvQ9QdAIfjzFt7B+L4N8q9SwufA=";
|
||||
hash = "sha256-j7lIRGO+hUYAM/FWCb8cNoh6lXXE0ZboWA/Hmi9w/Bc=";
|
||||
};
|
||||
|
||||
vendorSha256 = "sha256-mr07woy6QXRz8iM4Yzl1Wv5+jlG7ws/fDAnuHjNiUPc=";
|
||||
vendorHash = "sha256-sBbidDvsYvFg3EqsA59MYZULim/LbrZcInixiKfwqqQ=";
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
||||
|
||||
@ -1,8 +1,11 @@
|
||||
cmake_minimum_required (VERSION 2.6)
|
||||
project (nixos-option)
|
||||
|
||||
set(NIX_DEV_INCLUDEPATH "" CACHE STRING "path to nix include directory")
|
||||
|
||||
add_executable(nixos-option nixos-option.cc libnix-copy-paste.cc)
|
||||
target_link_libraries(nixos-option PRIVATE -lnixmain -lnixexpr -lnixstore -lnixutil)
|
||||
target_include_directories(nixos-option PUBLIC "${NIX_DEV_INCLUDEPATH}")
|
||||
target_link_libraries(nixos-option PRIVATE -lnixmain -lnixexpr -lnixstore -lnixutil -lnixcmd)
|
||||
target_compile_features(nixos-option PRIVATE cxx_std_17)
|
||||
|
||||
install (TARGETS nixos-option DESTINATION bin)
|
||||
|
||||
@ -1,14 +1,18 @@
|
||||
{lib, stdenv, boost, cmake, pkg-config, nix, ... }:
|
||||
{ lib, stdenv, boost, cmake, pkg-config, nix }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation {
|
||||
name = "nixos-option";
|
||||
|
||||
src = ./.;
|
||||
|
||||
strictDeps = true;
|
||||
nativeBuildInputs = [ cmake pkg-config ];
|
||||
buildInputs = [ boost nix ];
|
||||
cmakeFlags = [ "-DNIX_DEV_INCLUDEPATH=${nix.dev}/include/nix" ];
|
||||
|
||||
meta = with lib; {
|
||||
license = licenses.lgpl2Plus;
|
||||
maintainers = with maintainers; [ chkno ];
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ ];
|
||||
inherit (nix.meta) platforms;
|
||||
};
|
||||
}
|
||||
|
||||
@ -7,15 +7,12 @@
|
||||
#include "libnix-copy-paste.hh"
|
||||
#include <boost/format/alt_sstream.hpp> // for basic_altstringbuf...
|
||||
#include <boost/format/alt_sstream_impl.hpp> // for basic_altstringbuf...
|
||||
#include <boost/format/format_class.hpp> // for basic_format
|
||||
#include <boost/format/format_fwd.hpp> // for format
|
||||
#include <boost/format/format_implementation.hpp> // for basic_format::basi...
|
||||
#include <boost/optional/optional.hpp> // for get_pointer
|
||||
#include <iostream> // for operator<<, basic_...
|
||||
#include <nix/types.hh> // for Strings, Error
|
||||
#include <nix/types.hh> // for Strings
|
||||
#include <nix/error.hh> // for Error
|
||||
#include <string> // for string, basic_string
|
||||
|
||||
using boost::format;
|
||||
using nix::Error;
|
||||
using nix::Strings;
|
||||
using std::string;
|
||||
@ -34,7 +31,7 @@ Strings parseAttrPath(const string & s)
|
||||
++i;
|
||||
while (1) {
|
||||
if (i == s.end())
|
||||
throw Error(format("missing closing quote in selection path '%1%'") % s);
|
||||
throw Error("missing closing quote in selection path '%1%'", s);
|
||||
if (*i == '"')
|
||||
break;
|
||||
cur.push_back(*i++);
|
||||
|
||||
@ -37,13 +37,26 @@ using nix::Path;
|
||||
using nix::PathSet;
|
||||
using nix::Strings;
|
||||
using nix::Symbol;
|
||||
using nix::tAttrs;
|
||||
using nix::nAttrs;
|
||||
using nix::ThrownError;
|
||||
using nix::tLambda;
|
||||
using nix::tString;
|
||||
using nix::nString;
|
||||
using nix::UsageError;
|
||||
using nix::Value;
|
||||
|
||||
struct Context
|
||||
{
|
||||
Context(EvalState & state, Bindings & autoArgs, Value optionsRoot, Value configRoot)
|
||||
: state(state), autoArgs(autoArgs), optionsRoot(optionsRoot), configRoot(configRoot),
|
||||
underscoreType(state.symbols.create("_type"))
|
||||
{}
|
||||
EvalState & state;
|
||||
Bindings & autoArgs;
|
||||
Value optionsRoot;
|
||||
Value configRoot;
|
||||
Symbol underscoreType;
|
||||
};
|
||||
|
||||
// An ostream wrapper to handle nested indentation
|
||||
class Out
|
||||
{
|
||||
@ -74,6 +87,8 @@ class Out
|
||||
LinePolicy policy;
|
||||
bool writeSinceSep;
|
||||
template <typename T> friend Out & operator<<(Out & o, T thing);
|
||||
|
||||
friend void printValue(Context & ctx, Out & out, std::variant<Value, std::exception_ptr> maybeValue, const std::string & path);
|
||||
};
|
||||
|
||||
template <typename T> Out & operator<<(Out & o, T thing)
|
||||
@ -101,23 +116,10 @@ Out::Out(Out & o, const std::string & start, const std::string & end, LinePolicy
|
||||
*this << Out::sep;
|
||||
}
|
||||
|
||||
// Stuff needed for evaluation
|
||||
struct Context
|
||||
{
|
||||
Context(EvalState & state, Bindings & autoArgs, Value optionsRoot, Value configRoot)
|
||||
: state(state), autoArgs(autoArgs), optionsRoot(optionsRoot), configRoot(configRoot),
|
||||
underscoreType(state.symbols.create("_type"))
|
||||
{}
|
||||
EvalState & state;
|
||||
Bindings & autoArgs;
|
||||
Value optionsRoot;
|
||||
Value configRoot;
|
||||
Symbol underscoreType;
|
||||
};
|
||||
|
||||
Value evaluateValue(Context & ctx, Value & v)
|
||||
{
|
||||
ctx.state.forceValue(v);
|
||||
ctx.state.forceValue(v, v.attrs->pos);
|
||||
if (ctx.autoArgs.empty()) {
|
||||
return v;
|
||||
}
|
||||
@ -128,7 +130,7 @@ Value evaluateValue(Context & ctx, Value & v)
|
||||
|
||||
bool isOption(Context & ctx, const Value & v)
|
||||
{
|
||||
if (v.type != tAttrs) {
|
||||
if (v.type() != nAttrs) {
|
||||
return false;
|
||||
}
|
||||
const auto & actualType = v.attrs->find(ctx.underscoreType);
|
||||
@ -137,7 +139,7 @@ bool isOption(Context & ctx, const Value & v)
|
||||
}
|
||||
try {
|
||||
Value evaluatedType = evaluateValue(ctx, *actualType->value);
|
||||
if (evaluatedType.type != tString) {
|
||||
if (evaluatedType.type() != nString) {
|
||||
return false;
|
||||
}
|
||||
return static_cast<std::string>(evaluatedType.string.s) == "option";
|
||||
@ -168,7 +170,14 @@ const std::string appendPath(const std::string & prefix, const std::string & suf
|
||||
return prefix + "." + quoteAttribute(suffix);
|
||||
}
|
||||
|
||||
bool forbiddenRecursionName(std::string name) { return (!name.empty() && name[0] == '_') || name == "haskellPackages"; }
|
||||
bool forbiddenRecursionName(const nix::Symbol symbol, const nix::SymbolTable & symbolTable) {
|
||||
// note: this is created from a pointer
|
||||
// According to standard, it may never point to null, and hence attempts to check against nullptr are not allowed.
|
||||
// However, at the time of writing, I am not certain about the full implications of the omission of a nullptr check here.
|
||||
const std::string & name = symbolTable[symbol];
|
||||
// TODO: figure out why haskellPackages is not recursed here
|
||||
return (!name.empty() && name[0] == '_') || name == "haskellPackages";
|
||||
}
|
||||
|
||||
void recurse(const std::function<bool(const std::string & path, std::variant<Value, std::exception_ptr>)> & f,
|
||||
Context & ctx, Value v, const std::string & path)
|
||||
@ -186,14 +195,14 @@ void recurse(const std::function<bool(const std::string & path, std::variant<Val
|
||||
return;
|
||||
}
|
||||
const Value & evaluated_value = std::get<Value>(evaluated);
|
||||
if (evaluated_value.type != tAttrs) {
|
||||
if (evaluated_value.type() != nAttrs) {
|
||||
return;
|
||||
}
|
||||
for (const auto & child : evaluated_value.attrs->lexicographicOrder()) {
|
||||
if (forbiddenRecursionName(child->name)) {
|
||||
for (const auto & child : evaluated_value.attrs->lexicographicOrder(ctx.state.symbols)) {
|
||||
if (forbiddenRecursionName(child->name, ctx.state.symbols)) {
|
||||
continue;
|
||||
}
|
||||
recurse(f, ctx, *child->value, appendPath(path, child->name));
|
||||
recurse(f, ctx, *child->value, appendPath(path, ctx.state.symbols[child->name]));
|
||||
}
|
||||
}
|
||||
|
||||
@ -205,7 +214,7 @@ bool optionTypeIs(Context & ctx, Value & v, const std::string & soughtType)
|
||||
return false;
|
||||
}
|
||||
Value type = evaluateValue(ctx, *typeLookup->value);
|
||||
if (type.type != tAttrs) {
|
||||
if (type.type() != nAttrs) {
|
||||
return false;
|
||||
}
|
||||
const auto & nameLookup = type.attrs->find(ctx.state.sName);
|
||||
@ -213,7 +222,7 @@ bool optionTypeIs(Context & ctx, Value & v, const std::string & soughtType)
|
||||
return false;
|
||||
}
|
||||
Value name = evaluateValue(ctx, *nameLookup->value);
|
||||
if (name.type != tString) {
|
||||
if (name.type() != nString) {
|
||||
return false;
|
||||
}
|
||||
return name.string.s == soughtType;
|
||||
@ -231,14 +240,14 @@ MakeError(OptionPathError, EvalError);
|
||||
|
||||
Value getSubOptions(Context & ctx, Value & option)
|
||||
{
|
||||
Value getSubOptions = evaluateValue(ctx, *findAlongAttrPath(ctx.state, "type.getSubOptions", ctx.autoArgs, option));
|
||||
if (getSubOptions.type != tLambda) {
|
||||
Value getSubOptions = evaluateValue(ctx, *findAlongAttrPath(ctx.state, "type.getSubOptions", ctx.autoArgs, option).first);
|
||||
if (getSubOptions.isLambda()) {
|
||||
throw OptionPathError("Option's type.getSubOptions isn't a function");
|
||||
}
|
||||
Value emptyString{};
|
||||
nix::mkString(emptyString, "");
|
||||
emptyString.mkString("");
|
||||
Value v;
|
||||
ctx.state.callFunction(getSubOptions, emptyString, v, nix::Pos{});
|
||||
ctx.state.callFunction(getSubOptions, emptyString, v, nix::PosIdx{});
|
||||
return v;
|
||||
}
|
||||
|
||||
@ -273,7 +282,7 @@ FindAlongOptionPathRet findAlongOptionPath(Context & ctx, const std::string & pa
|
||||
v = subOptions;
|
||||
// Note that we've consumed attr, but didn't actually use it. This is the path component that's looked
|
||||
// up in the list or attribute set that doesn't name an option -- the "root" in "users.users.root.name".
|
||||
} else if (v.type != tAttrs) {
|
||||
} else if (v.type() != nAttrs) {
|
||||
throw OptionPathError("Value is %s while a set was expected", showType(v));
|
||||
} else {
|
||||
const auto & next = v.attrs->find(ctx.state.symbols.create(attr));
|
||||
@ -336,14 +345,14 @@ void mapConfigValuesInOption(
|
||||
{
|
||||
Value * option;
|
||||
try {
|
||||
option = findAlongAttrPath(ctx.state, path, ctx.autoArgs, ctx.configRoot);
|
||||
option = findAlongAttrPath(ctx.state, path, ctx.autoArgs, ctx.configRoot).first;
|
||||
} catch (Error &) {
|
||||
f(path, std::current_exception());
|
||||
return;
|
||||
}
|
||||
recurse(
|
||||
[f, ctx](const std::string & path, std::variant<Value, std::exception_ptr> v) {
|
||||
bool leaf = std::holds_alternative<std::exception_ptr>(v) || std::get<Value>(v).type != tAttrs ||
|
||||
bool leaf = std::holds_alternative<std::exception_ptr>(v) || std::get<Value>(v).type() != nAttrs ||
|
||||
ctx.state.isDerivation(std::get<Value>(v));
|
||||
if (!leaf) {
|
||||
return true; // Keep digging
|
||||
@ -362,7 +371,7 @@ void describeDerivation(Context & ctx, Out & out, Value v)
|
||||
Bindings::iterator i = v.attrs->find(ctx.state.sDrvPath);
|
||||
PathSet pathset;
|
||||
try {
|
||||
Path drvPath = i != v.attrs->end() ? ctx.state.coerceToPath(*i->pos, *i->value, pathset) : "???";
|
||||
Path drvPath = i != v.attrs->end() ? ctx.state.coerceToPath(i->pos, *i->value, pathset, "while evaluating the drvPath of a derivation") : "???";
|
||||
out << "«derivation " << drvPath << "»";
|
||||
} catch (Error & e) {
|
||||
out << describeError(e);
|
||||
@ -390,9 +399,9 @@ void printList(Context & ctx, Out & out, Value & v)
|
||||
void printAttrs(Context & ctx, Out & out, Value & v, const std::string & path)
|
||||
{
|
||||
Out attrsOut(out, "{", "}", v.attrs->size());
|
||||
for (const auto & a : v.attrs->lexicographicOrder()) {
|
||||
std::string name = a->name;
|
||||
if (!forbiddenRecursionName(name)) {
|
||||
for (const auto & a : v.attrs->lexicographicOrder(ctx.state.symbols)) {
|
||||
if (!forbiddenRecursionName(a->name, ctx.state.symbols)) {
|
||||
const std::string name = ctx.state.symbols[a->name];
|
||||
attrsOut << name << " = ";
|
||||
printValue(ctx, attrsOut, *a->value, appendPath(path, name));
|
||||
attrsOut << ";" << Out::sep;
|
||||
@ -447,13 +456,13 @@ void printValue(Context & ctx, Out & out, std::variant<Value, std::exception_ptr
|
||||
describeDerivation(ctx, out, v);
|
||||
} else if (v.isList()) {
|
||||
printList(ctx, out, v);
|
||||
} else if (v.type == tAttrs) {
|
||||
} else if (v.type() == nAttrs) {
|
||||
printAttrs(ctx, out, v, path);
|
||||
} else if (v.type == tString && std::string(v.string.s).find('\n') != std::string::npos) {
|
||||
} else if (v.type() == nString && std::string(v.string.s).find('\n') != std::string::npos) {
|
||||
printMultiLineString(out, v);
|
||||
} else {
|
||||
ctx.state.forceValueDeep(v);
|
||||
out << v;
|
||||
v.print(ctx.state.symbols, out.ostream);
|
||||
}
|
||||
} catch (ThrownError & e) {
|
||||
if (e.msg() == "The option `" + path + "' is used but not defined.") {
|
||||
@ -505,7 +514,7 @@ void printRecursive(Context & ctx, Out & out, const std::string & path)
|
||||
void printAttr(Context & ctx, Out & out, const std::string & path, Value & root)
|
||||
{
|
||||
try {
|
||||
printValue(ctx, out, *findAlongAttrPath(ctx.state, path, ctx.autoArgs, root), path);
|
||||
printValue(ctx, out, *findAlongAttrPath(ctx.state, path, ctx.autoArgs, root).first, path);
|
||||
} catch (Error & e) {
|
||||
out << describeError(e);
|
||||
}
|
||||
@ -548,11 +557,11 @@ void printOption(Context & ctx, Out & out, const std::string & path, Value & opt
|
||||
out << "\n";
|
||||
}
|
||||
|
||||
void printListing(Out & out, Value & v)
|
||||
void printListing(Context & ctx, Out & out, Value & v)
|
||||
{
|
||||
out << "This attribute set contains:\n";
|
||||
for (const auto & a : v.attrs->lexicographicOrder()) {
|
||||
std::string name = a->name;
|
||||
for (const auto & a : v.attrs->lexicographicOrder(ctx.state.symbols)) {
|
||||
const std::string & name = ctx.state.symbols[a->name];
|
||||
if (!name.empty() && name[0] != '_') {
|
||||
out << name << "\n";
|
||||
}
|
||||
@ -571,7 +580,7 @@ void printOne(Context & ctx, Out & out, const std::string & path)
|
||||
if (isOption(ctx, option)) {
|
||||
printOption(ctx, out, result.path, option);
|
||||
} else {
|
||||
printListing(out, option);
|
||||
printListing(ctx, out, option);
|
||||
}
|
||||
} catch (Error & e) {
|
||||
std::cerr << "error: " << e.msg()
|
||||
@ -594,7 +603,7 @@ int main(int argc, char ** argv)
|
||||
using nix::LegacyArgs::LegacyArgs;
|
||||
};
|
||||
|
||||
MyArgs myArgs(nix::baseNameOf(argv[0]), [&](Strings::iterator & arg, const Strings::iterator & end) {
|
||||
MyArgs myArgs(std::string(nix::baseNameOf(argv[0])), [&](Strings::iterator & arg, const Strings::iterator & end) {
|
||||
if (*arg == "--help") {
|
||||
nix::showManPage("nixos-option");
|
||||
} else if (*arg == "--version") {
|
||||
@ -617,7 +626,7 @@ int main(int argc, char ** argv)
|
||||
|
||||
myArgs.parseCmdline(nix::argvToStrings(argc, argv));
|
||||
|
||||
nix::initPlugins();
|
||||
nix::initNix();
|
||||
nix::initGC();
|
||||
nix::settings.readOnlyMode = true;
|
||||
auto store = nix::openStore();
|
||||
|
||||
@ -5715,6 +5715,8 @@ with pkgs;
|
||||
|
||||
mpd-mpris = callPackage ../tools/audio/mpd-mpris { };
|
||||
|
||||
mpd-notification = callPackage ../tools/audio/mpd-notification { };
|
||||
|
||||
mpd-sima = python3Packages.callPackage ../tools/audio/mpd-sima { };
|
||||
|
||||
mpris-scrobbler = callPackage ../tools/audio/mpris-scrobbler { };
|
||||
@ -6163,6 +6165,8 @@ with pkgs;
|
||||
|
||||
moosefs = callPackage ../tools/filesystems/moosefs { };
|
||||
|
||||
mountain-duck = callPackage ../tools/filesystems/mountain-duck { };
|
||||
|
||||
mozlz4a = callPackage ../tools/compression/mozlz4a { };
|
||||
|
||||
msr-tools = callPackage ../os-specific/linux/msr-tools { };
|
||||
@ -19254,12 +19258,7 @@ with pkgs;
|
||||
|
||||
modd = callPackage ../development/tools/modd { };
|
||||
|
||||
mold = callPackage ../development/tools/mold {
|
||||
# C++20 is required, aarch64-linux has gcc 9 by default
|
||||
stdenv = if stdenv.isLinux && stdenv.isAarch64
|
||||
then llvmPackages_12.libcxxStdenv
|
||||
else llvmPackages.stdenv;
|
||||
};
|
||||
mold = callPackage ../development/tools/mold { };
|
||||
|
||||
moon = callPackage ../development/tools/build-managers/moon/default.nix { };
|
||||
|
||||
@ -36410,12 +36409,10 @@ with pkgs;
|
||||
|
||||
elements = libsForQt5.callPackage ../applications/blockchains/elements {
|
||||
withGui = true;
|
||||
boost = boost175;
|
||||
inherit (darwin) autoSignDarwinBinariesHook;
|
||||
};
|
||||
elementsd = callPackage ../applications/blockchains/elements {
|
||||
withGui = false;
|
||||
boost = boost175;
|
||||
inherit (darwin) autoSignDarwinBinariesHook;
|
||||
};
|
||||
elementsd-simplicity = elementsd.overrideAttrs {
|
||||
@ -39554,7 +39551,7 @@ with pkgs;
|
||||
|
||||
dxvk = callPackage ../misc/dxvk { };
|
||||
dxvk_1 = callPackage ../misc/dxvk/dxvk.nix { dxvkVersion = "1.10"; };
|
||||
dxvk_2 = callPackage ../misc/dxvk/dxvk.nix { dxvkVersion = "2.1"; };
|
||||
dxvk_2 = callPackage ../misc/dxvk/dxvk.nix { };
|
||||
|
||||
ec2stepshell = callPackage ../tools/security/ec2stepshell { };
|
||||
|
||||
@ -39989,7 +39986,7 @@ with pkgs;
|
||||
|
||||
nix-melt = callPackage ../tools/nix/nix-melt { };
|
||||
|
||||
nixos-option = callPackage ../tools/nix/nixos-option { nix = nixVersions.nix_2_3; };
|
||||
nixos-option = callPackage ../tools/nix/nixos-option { };
|
||||
|
||||
nix-pin = callPackage ../tools/package-management/nix-pin { };
|
||||
|
||||
|
||||
@ -292,7 +292,9 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||
|
||||
smbclient = callPackage ../development/php-packages/smbclient { };
|
||||
|
||||
snuffleupagus = callPackage ../development/php-packages/snuffleupagus { };
|
||||
snuffleupagus = callPackage ../development/php-packages/snuffleupagus {
|
||||
inherit (pkgs) darwin;
|
||||
};
|
||||
|
||||
sqlsrv = callPackage ../development/php-packages/sqlsrv { };
|
||||
|
||||
|
||||
@ -634,6 +634,8 @@ self: super: with self; {
|
||||
|
||||
arnparse = callPackage ../development/python-modules/arnparse { };
|
||||
|
||||
array-record = callPackage ../development/python-modules/array-record { };
|
||||
|
||||
arrayqueues = callPackage ../development/python-modules/arrayqueues { };
|
||||
|
||||
arris-tg2492lg = callPackage ../development/python-modules/arris-tg2492lg { };
|
||||
@ -3517,6 +3519,8 @@ self: super: with self; {
|
||||
|
||||
factory_boy = callPackage ../development/python-modules/factory_boy { };
|
||||
|
||||
fairscale = callPackage ../development/python-modules/fairscale { };
|
||||
|
||||
faiss = toPythonModule (pkgs.faiss.override {
|
||||
pythonSupport = true;
|
||||
pythonPackages = self;
|
||||
@ -3856,6 +3860,8 @@ self: super: with self; {
|
||||
|
||||
flux-led = callPackage ../development/python-modules/flux-led { };
|
||||
|
||||
flyingsquid = callPackage ../development/python-modules/flyingsquid { };
|
||||
|
||||
flynt = callPackage ../development/python-modules/flynt { };
|
||||
|
||||
fn = callPackage ../development/python-modules/fn { };
|
||||
@ -3989,6 +3995,8 @@ self: super: with self; {
|
||||
|
||||
fuzzywuzzy = callPackage ../development/python-modules/fuzzywuzzy { };
|
||||
|
||||
fvcore = callPackage ../development/python-modules/fvcore { };
|
||||
|
||||
fvs = callPackage ../development/python-modules/fvs { };
|
||||
|
||||
fx2 = callPackage ../development/python-modules/fx2 { };
|
||||
@ -6343,6 +6351,8 @@ self: super: with self; {
|
||||
|
||||
metar = callPackage ../development/python-modules/metar { };
|
||||
|
||||
metawear = callPackage ../development/python-modules/metawear { };
|
||||
|
||||
meteoalertapi = callPackage ../development/python-modules/meteoalertapi { };
|
||||
|
||||
meteocalc = callPackage ../development/python-modules/meteocalc { };
|
||||
@ -7730,6 +7740,8 @@ self: super: with self; {
|
||||
|
||||
pencompy = callPackage ../development/python-modules/pencompy { };
|
||||
|
||||
pgmpy = callPackage ../development/python-modules/pgmpy { };
|
||||
|
||||
phonopy = callPackage ../development/python-modules/phonopy { };
|
||||
|
||||
pixcat = callPackage ../development/python-modules/pixcat { };
|
||||
@ -8168,6 +8180,8 @@ self: super: with self; {
|
||||
|
||||
posix_ipc = callPackage ../development/python-modules/posix_ipc { };
|
||||
|
||||
posthog = callPackage ../development/python-modules/posthog { };
|
||||
|
||||
pot = callPackage ../development/python-modules/pot { };
|
||||
|
||||
potentials = callPackage ../development/python-modules/potentials { };
|
||||
|
||||
Loading…
Reference in New Issue
Block a user